Merge branch 'master' of git.labs.intellij.net:idea/community cidr/96.901 idea/96.902 pycharm/96.903 rubymine/96.904
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 9 Aug 2010 20:06:54 +0000 (00:06 +0400)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 9 Aug 2010 20:06:54 +0000 (00:06 +0400)

Trivial merge