Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 16 Jul 2010 11:30:05 +0000 (15:30 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 16 Jul 2010 11:30:05 +0000 (15:30 +0400)

Trivial merge