Merge branch 'master' of git.labs.intellij.net:idea/community pycharm/96.865
authorirengrig <Irina.Chernushina@jetbrains.com>
Wed, 4 Aug 2010 16:02:03 +0000 (20:02 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Wed, 4 Aug 2010 16:02:03 +0000 (20:02 +0400)

Trivial merge