Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Tue, 3 Aug 2010 12:56:57 +0000 (16:56 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Tue, 3 Aug 2010 12:56:57 +0000 (16:56 +0400)

Trivial merge