Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 1 Dec 2010 19:51:25 +0000 (22:51 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 1 Dec 2010 19:51:25 +0000 (22:51 +0300)

Trivial merge