Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorDenis Zhdanov <Denis.Zhdanov@jetbrains.com>
Thu, 29 Apr 2010 15:20:51 +0000 (19:20 +0400)
committerDenis Zhdanov <Denis.Zhdanov@jetbrains.com>
Thu, 29 Apr 2010 15:20:51 +0000 (19:20 +0400)

Trivial merge