Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 17 Dec 2010 13:20:47 +0000 (16:20 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 17 Dec 2010 13:20:47 +0000 (16:20 +0300)

Trivial merge