Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Mon, 15 Feb 2010 16:19:42 +0000 (15 19:19 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Mon, 15 Feb 2010 16:19:42 +0000 (15 19:19 +0300)

Trivial merge