Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 26 Mar 2010 12:55:59 +0000 (15:55 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 26 Mar 2010 12:55:59 +0000 (15:55 +0300)

Trivial merge