Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Thu, 4 Mar 2010 11:44:40 +0000 (14:44 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Thu, 4 Mar 2010 11:44:40 +0000 (14:44 +0300)

Trivial merge