Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Wed, 2 Jun 2010 15:33:02 +0000 (19:33 +0400)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Wed, 2 Jun 2010 15:33:02 +0000 (19:33 +0400)

Trivial merge