Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Mon, 29 Nov 2010 13:20:59 +0000 (16:20 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Mon, 29 Nov 2010 13:20:59 +0000 (16:20 +0300)

Trivial merge