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

Trivial merge