Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Thu, 4 Feb 2010 12:36:55 +0000 (15:36 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Thu, 4 Feb 2010 12:36:55 +0000 (15:36 +0300)

Trivial merge