Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Tue, 9 Mar 2010 13:11:02 +0000 (16:11 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Tue, 9 Mar 2010 13:11:02 +0000 (16:11 +0300)

Trivial merge