Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Wed, 24 Mar 2010 14:00:27 +0000 (17:00 +0300)
committerDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Wed, 24 Mar 2010 14:00:27 +0000 (17:00 +0300)

Trivial merge