Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Thu, 25 Feb 2010 15:21:38 +0000 (18:21 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Thu, 25 Feb 2010 15:21:38 +0000 (18:21 +0300)

Trivial merge