Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Tue, 22 Jun 2010 12:51:37 +0000 (16:51 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Tue, 22 Jun 2010 12:51:37 +0000 (16:51 +0400)

Trivial merge