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

Trivial merge