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

Trivial merge