Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 29 Oct 2010 12:46:05 +0000 (16:46 +0400)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Fri, 29 Oct 2010 12:46:05 +0000 (16:46 +0400)

Trivial merge