Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Wed, 7 Jul 2010 11:02:31 +0000 (15:02 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Wed, 7 Jul 2010 11:02:31 +0000 (15:02 +0400)

Trivial merge