Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Tue, 10 May 2011 16:19:13 +0000 (20:19 +0400)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Tue, 10 May 2011 16:19:13 +0000 (20:19 +0400)

Trivial merge