Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 16 Apr 2010 17:26:04 +0000 (21:26 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 16 Apr 2010 17:26:04 +0000 (21:26 +0400)

Trivial merge