Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 6 Aug 2010 06:55:09 +0000 (10:55 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 6 Aug 2010 06:55:09 +0000 (10:55 +0400)

Trivial merge