Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Tue, 1 Dec 2009 13:25:05 +0000 (16:25 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Tue, 1 Dec 2009 13:25:05 +0000 (16:25 +0300)

Trivial merge