Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Mon, 28 Jun 2010 06:11:00 +0000 (10:11 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Mon, 28 Jun 2010 06:11:00 +0000 (10:11 +0400)

Trivial merge