Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Fri, 27 Nov 2009 12:46:59 +0000 (15:46 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Fri, 27 Nov 2009 12:46:59 +0000 (15:46 +0300)

Trivial merge