Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorDenis Zhdanov <Denis.Zhdanov@jetbrains.com>
Mon, 26 Apr 2010 05:43:38 +0000 (09:43 +0400)
committerDenis Zhdanov <Denis.Zhdanov@jetbrains.com>
Mon, 26 Apr 2010 05:43:38 +0000 (09:43 +0400)

Trivial merge