Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Tue, 16 Feb 2010 11:01:46 +0000 (14:01 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Tue, 16 Feb 2010 11:01:46 +0000 (14:01 +0300)

Trivial merge