Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Thu, 26 Aug 2010 14:35:39 +0000 (18:35 +0400)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Thu, 26 Aug 2010 14:35:39 +0000 (18:35 +0400)

Trivial merge