Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 24 Nov 2010 15:28:11 +0000 (18:28 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Wed, 24 Nov 2010 15:28:11 +0000 (18:28 +0300)

Trivial merge