Merge branch 'master' of git@git.labs.intellij.net:idea/community cidr/96.1148
authorEugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Fri, 10 Sep 2010 16:23:15 +0000 (20:23 +0400)
committerEugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Fri, 10 Sep 2010 16:23:15 +0000 (20:23 +0400)

Trivial merge