Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Thu, 14 Jul 2011 09:29:11 +0000 (13:29 +0400)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Thu, 14 Jul 2011 09:29:11 +0000 (13:29 +0400)

Trivial merge