Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Mon, 13 Sep 2010 19:34:43 +0000 (23:34 +0400)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Mon, 13 Sep 2010 19:34:43 +0000 (23:34 +0400)

Trivial merge