Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 2 Dec 2010 15:44:29 +0000 (18:44 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 2 Dec 2010 15:44:29 +0000 (18:44 +0300)

Trivial merge