Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Fri, 29 Jan 2010 09:48:28 +0000 (12:48 +0300)
committerirengrig <Irina.Chernushina@jetbrains.com>
Fri, 29 Jan 2010 09:48:28 +0000 (12:48 +0300)

Trivial merge