Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Thu, 30 Sep 2010 23:12:31 +0000 (03:12 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Thu, 30 Sep 2010 23:12:31 +0000 (03:12 +0400)

Trivial merge