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

Trivial merge