Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorDenis Zhdanov <Denis.Zhdanov@jetbrains.com>
Tue, 27 Apr 2010 14:57:28 +0000 (18:57 +0400)
committerDenis Zhdanov <Denis.Zhdanov@jetbrains.com>
Tue, 27 Apr 2010 14:57:28 +0000 (18:57 +0400)

Trivial merge