Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Wed, 5 May 2010 05:50:33 +0000 (09:50 +0400)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Wed, 5 May 2010 05:50:33 +0000 (09:50 +0400)

Trivial merge