Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorOleg Shpynov <oleg.shpynov@jetbrains.com>
Mon, 19 Oct 2009 08:32:11 +0000 (12:32 +0400)
committerOleg Shpynov <oleg.shpynov@jetbrains.com>
Mon, 19 Oct 2009 08:32:11 +0000 (12:32 +0400)

Trivial merge