Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Thu, 15 Jul 2010 09:53:20 +0000 (13:53 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Thu, 15 Jul 2010 09:53:20 +0000 (13:53 +0400)

Trivial merge