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

Trivial merge