Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Thu, 30 Sep 2010 16:07:52 +0000 (20:07 +0400)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Thu, 30 Sep 2010 16:07:52 +0000 (20:07 +0400)

Trivial merge