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

Trivial merge