Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Tue, 2 Nov 2010 13:18:39 +0000 (16:18 +0300)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Tue, 2 Nov 2010 13:18:39 +0000 (16:18 +0300)

Trivial merge