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

Trivial merge