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

Trivial merge