Merge branch 'master' of git.labs.intellij.net:idea/community
authorirengrig <Irina.Chernushina@jetbrains.com>
Thu, 20 May 2010 12:21:55 +0000 (16:21 +0400)
committerirengrig <Irina.Chernushina@jetbrains.com>
Thu, 20 May 2010 12:21:55 +0000 (16:21 +0400)

Trivial merge