Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorOleg Shpynov <oleg.shpynov@jetbrains.com>
Tue, 20 Apr 2010 12:28:58 +0000 (16:28 +0400)
committerOleg Shpynov <oleg.shpynov@jetbrains.com>
Tue, 20 Apr 2010 12:28:58 +0000 (16:28 +0400)

Trivial merge