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

Trivial merge