Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Thu, 21 Jan 2010 13:14:38 +0000 (16:14 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Thu, 21 Jan 2010 13:14:38 +0000 (16:14 +0300)

Trivial merge