Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Wed, 3 Mar 2010 14:21:25 +0000 (17:21 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Wed, 3 Mar 2010 14:21:25 +0000 (17:21 +0300)

Trivial merge