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

Trivial merge