Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Fri, 13 Aug 2010 13:29:59 +0000 (17:29 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Fri, 13 Aug 2010 13:29:59 +0000 (17:29 +0400)

Trivial merge