Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Tue, 27 Apr 2010 13:11:47 +0000 (17:11 +0400)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Tue, 27 Apr 2010 13:11:47 +0000 (17:11 +0400)

Trivial merge