Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Wed, 11 Nov 2009 14:39:08 +0000 (17:39 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Wed, 11 Nov 2009 14:39:08 +0000 (17:39 +0300)

Trivial merge