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

Trivial merge