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

Trivial merge