Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Tue, 5 Oct 2010 15:17:08 +0000 (19:17 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Tue, 5 Oct 2010 15:17:08 +0000 (19:17 +0400)

Trivial merge