Merge branch 'master' of git@git.labs.intellij.net:idea/community
authornik <Nikolay.Chashnikov@jetbrains.com>
Thu, 26 Nov 2009 06:25:11 +0000 (09:25 +0300)
committernik <Nikolay.Chashnikov@jetbrains.com>
Thu, 26 Nov 2009 06:25:11 +0000 (09:25 +0300)

Trivial merge