Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Wed, 14 Oct 2009 14:34:37 +0000 (18:34 +0400)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Wed, 14 Oct 2009 14:34:37 +0000 (18:34 +0400)

Trivial merge