Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Sat, 27 Feb 2010 11:52:29 +0000 (14:52 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Sat, 27 Feb 2010 11:52:29 +0000 (14:52 +0300)

Trivial merge