Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Tue, 18 Jan 2011 11:02:10 +0000 (14:02 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Tue, 18 Jan 2011 11:02:10 +0000 (14:02 +0300)

Trivial merge