Merge branch 'master' of git@git.labs.intellij.net:idea/community
authornik <Nikolay.Chashnikov@jetbrains.com>
Mon, 28 Sep 2009 12:35:54 +0000 (16:35 +0400)
committernik <Nikolay.Chashnikov@jetbrains.com>
Mon, 28 Sep 2009 12:35:54 +0000 (16:35 +0400)

Trivial merge