Merge branch 'master' of git.labs.intellij.net:idea/community94.295
authorDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Fri, 12 Feb 2010 11:50:26 +0000 (12 14:50 +0300)
committerDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Fri, 12 Feb 2010 11:50:26 +0000 (12 14:50 +0300)

Trivial merge