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

Trivial merge