Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 10 Aug 2010 12:56:28 +0000 (16:56 +0400)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 10 Aug 2010 12:56:28 +0000 (16:56 +0400)

Trivial merge