Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Tue, 20 Apr 2010 12:30:35 +0000 (16:30 +0400)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Tue, 20 Apr 2010 12:30:35 +0000 (16:30 +0400)

Trivial merge