Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Fri, 5 Mar 2010 09:44:46 +0000 (12:44 +0300)
committerDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Fri, 5 Mar 2010 09:44:46 +0000 (12:44 +0300)

Trivial merge