Merge branch 'master' of git.labs.intellij.net:idea/community cidr/96.986 idea/96.985 pycharm/96.987 rubymine/96.988
authorDmitry Jemerov <yole@jetbrains.com>
Fri, 20 Aug 2010 19:54:19 +0000 (23:54 +0400)
committerDmitry Jemerov <yole@jetbrains.com>
Fri, 20 Aug 2010 19:54:19 +0000 (23:54 +0400)

Trivial merge