Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Fri, 12 Feb 2010 10:55:11 +0000 (12 13:55 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Fri, 12 Feb 2010 10:55:11 +0000 (12 13:55 +0300)

Trivial merge