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

Trivial merge