Merge branch 'master' of git@git.labs.intellij.net:idea/community
authornik <Nikolay.Chashnikov@jetbrains.com>
Wed, 30 Sep 2009 06:19:20 +0000 (10:19 +0400)
committernik <Nikolay.Chashnikov@jetbrains.com>
Wed, 30 Sep 2009 06:19:20 +0000 (10:19 +0400)

Trivial merge