Merge branch 'master' of git.labs.intellij.net:idea/community cidr/96.251 cidr/96.256 idea/96.254 idea/96.257 pycharm/96.253 pycharm/96.258
authorMaxim.Mossienko <Maxim.Mossienko@jetbrains.com>
Sat, 22 May 2010 02:52:57 +0000 (19:52 -0700)
committerMaxim.Mossienko <Maxim.Mossienko@jetbrains.com>
Sat, 22 May 2010 02:52:57 +0000 (19:52 -0700)

Trivial merge