Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Wed, 17 Mar 2010 10:35:46 +0000 (13:35 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Wed, 17 Mar 2010 10:35:46 +0000 (13:35 +0300)

Trivial merge