Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorEugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Tue, 11 Jan 2011 18:23:15 +0000 (21:23 +0300)
committerEugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Tue, 11 Jan 2011 18:23:15 +0000 (21:23 +0300)

Trivial merge