Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 9 Dec 2010 11:56:27 +0000 (14:56 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 9 Dec 2010 11:56:27 +0000 (14:56 +0300)

Trivial merge