Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Fri, 16 Jul 2010 09:52:53 +0000 (13:52 +0400)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Fri, 16 Jul 2010 09:52:53 +0000 (13:52 +0400)

Trivial merge