Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Wed, 2 Dec 2009 18:56:36 +0000 (21:56 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Wed, 2 Dec 2009 18:56:36 +0000 (21:56 +0300)

Trivial merge