Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorDenis Zhdanov <Denis.Zhdanov@jetbrains.com>
Thu, 21 Oct 2010 06:21:10 +0000 (10:21 +0400)
committerDenis Zhdanov <Denis.Zhdanov@jetbrains.com>
Thu, 21 Oct 2010 06:21:10 +0000 (10:21 +0400)

Trivial merge