Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Mon, 26 Apr 2010 12:47:28 +0000 (16:47 +0400)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Mon, 26 Apr 2010 12:47:28 +0000 (16:47 +0400)

Trivial merge