Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorEugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Thu, 22 Apr 2010 16:50:43 +0000 (20:50 +0400)
committerEugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Thu, 22 Apr 2010 16:50:43 +0000 (20:50 +0400)

Trivial merge