Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Wed, 10 Feb 2010 12:27:41 +0000 (15:27 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Wed, 10 Feb 2010 12:27:41 +0000 (15:27 +0300)

Trivial merge