Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Sat, 27 Feb 2010 08:42:37 +0000 (11:42 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Sat, 27 Feb 2010 08:42:37 +0000 (11:42 +0300)

Trivial merge