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

Trivial merge