Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Tue, 6 Jul 2010 11:21:25 +0000 (15:21 +0400)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Tue, 6 Jul 2010 11:21:25 +0000 (15:21 +0400)

Trivial merge