Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Mon, 8 Feb 2010 12:27:18 +0000 (15:27 +0300)
committerDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Mon, 8 Feb 2010 12:27:18 +0000 (15:27 +0300)

Trivial merge