Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Fri, 11 Jun 2010 05:30:06 +0000 (09:30 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Fri, 11 Jun 2010 05:30:06 +0000 (09:30 +0400)

Trivial merge