Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Thu, 4 Mar 2010 13:01:26 +0000 (16:01 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Thu, 4 Mar 2010 13:01:26 +0000 (16:01 +0300)

Trivial merge