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

Trivial merge