Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Tue, 6 Jul 2010 06:28:38 +0000 (10:28 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Tue, 6 Jul 2010 06:28:38 +0000 (10:28 +0400)

Trivial merge