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

Trivial merge