Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Sun, 28 Feb 2010 20:56:47 +0000 (23:56 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Sun, 28 Feb 2010 20:56:47 +0000 (23:56 +0300)

Trivial merge