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

Trivial merge