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

Trivial merge