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

Trivial merge