Merge branch 'master' of git.labs.intellij.net:idea/community pycharm/96.850
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 2 Aug 2010 17:17:16 +0000 (21:17 +0400)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Mon, 2 Aug 2010 17:17:16 +0000 (21:17 +0400)

Trivial merge