Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorEugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Wed, 29 Dec 2010 15:33:06 +0000 (18:33 +0300)
committerEugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Wed, 29 Dec 2010 15:33:06 +0000 (18:33 +0300)

Trivial merge