Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorEugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Wed, 10 Mar 2010 14:31:25 +0000 (17:31 +0300)
committerEugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Wed, 10 Mar 2010 14:31:25 +0000 (17:31 +0300)

Trivial merge