Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Tue, 20 Jul 2010 14:23:32 +0000 (18:23 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Tue, 20 Jul 2010 14:23:32 +0000 (18:23 +0400)

Trivial merge