Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Thu, 12 Aug 2010 08:21:09 +0000 (12:21 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Thu, 12 Aug 2010 08:21:09 +0000 (12:21 +0400)

Trivial merge