Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Fri, 2 Apr 2010 12:47:05 +0000 (16:47 +0400)
committerDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Fri, 2 Apr 2010 12:47:05 +0000 (16:47 +0400)

Trivial merge