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

Trivial merge