Merge branch 'master' of git@git.labs.intellij.net:idea/community idea/96.432
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Mon, 21 Jun 2010 06:12:01 +0000 (10:12 +0400)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Mon, 21 Jun 2010 06:12:01 +0000 (10:12 +0400)

Trivial merge