Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 12 Feb 2010 16:22:21 +0000 (12 19:22 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 12 Feb 2010 16:22:21 +0000 (12 19:22 +0300)

Trivial merge