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

Trivial merge