Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Tue, 26 Jan 2010 14:58:13 +0000 (17:58 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Tue, 26 Jan 2010 14:58:13 +0000 (17:58 +0300)

Trivial merge