Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Mon, 15 Mar 2010 16:30:14 +0000 (19:30 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Mon, 15 Mar 2010 16:30:14 +0000 (19:30 +0300)

Trivial merge