Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Fri, 18 Jun 2010 12:23:07 +0000 (16:23 +0400)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Fri, 18 Jun 2010 12:23:07 +0000 (16:23 +0400)

Trivial merge