Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Wed, 3 Feb 2010 17:24:17 +0000 (20:24 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Wed, 3 Feb 2010 17:24:17 +0000 (20:24 +0300)

Trivial merge