Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorEugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Wed, 1 Dec 2010 13:44:21 +0000 (16:44 +0300)
committerEugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Wed, 1 Dec 2010 13:44:21 +0000 (16:44 +0300)

Trivial merge