Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorEugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Tue, 16 Mar 2010 16:51:57 +0000 (19:51 +0300)
committerEugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Tue, 16 Mar 2010 16:51:57 +0000 (19:51 +0300)

Trivial merge