Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Wed, 3 Feb 2010 09:03:41 +0000 (12:03 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Wed, 3 Feb 2010 09:03:41 +0000 (12:03 +0300)

Trivial merge