Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorEugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Fri, 3 Sep 2010 10:38:05 +0000 (14:38 +0400)
committerEugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Fri, 3 Sep 2010 10:38:05 +0000 (14:38 +0400)

Trivial merge