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

Trivial merge