Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Mon, 24 Jan 2011 10:51:53 +0000 (13:51 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Mon, 24 Jan 2011 10:51:53 +0000 (13:51 +0300)

Trivial merge