Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Fri, 10 Sep 2010 13:47:09 +0000 (17:47 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Fri, 10 Sep 2010 13:47:09 +0000 (17:47 +0400)

Trivial merge