Merge branch 'master' of git.labs.intellij.net:idea/community cidr/100.21 idea/100.23 pycharm/100.22 rubymine/100.24
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 9 Dec 2010 21:09:27 +0000 (00:09 +0300)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 9 Dec 2010 21:09:27 +0000 (00:09 +0300)

Trivial merge