Merge branch 'master' of git@git.labs.intellij.net:idea/community
authornik <Nikolay.Chashnikov@jetbrains.com>
Tue, 29 Sep 2009 14:02:47 +0000 (18:02 +0400)
committernik <Nikolay.Chashnikov@jetbrains.com>
Tue, 29 Sep 2009 14:02:47 +0000 (18:02 +0400)

Trivial merge