Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Thu, 9 Sep 2010 07:20:58 +0000 (11:20 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Thu, 9 Sep 2010 07:20:58 +0000 (11:20 +0400)

Trivial merge