Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 30 Jul 2010 13:52:39 +0000 (17:52 +0400)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 30 Jul 2010 13:52:39 +0000 (17:52 +0400)

Trivial merge