Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Fri, 26 Mar 2010 15:13:28 +0000 (18:13 +0300)
committerDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Fri, 26 Mar 2010 15:13:28 +0000 (18:13 +0300)

Trivial merge