Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Mon, 15 Mar 2010 11:51:19 +0000 (14:51 +0300)
committerDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Mon, 15 Mar 2010 11:51:19 +0000 (14:51 +0300)

Trivial merge