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

Trivial merge