Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 30 Nov 2010 20:14:56 +0000 (23:14 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 30 Nov 2010 20:14:56 +0000 (23:14 +0300)

Trivial merge