Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorKirill Kalishev <kirill.kalishev@jetbrains.com>
Tue, 16 Mar 2010 15:26:54 +0000 (18:26 +0300)
committerKirill Kalishev <kirill.kalishev@jetbrains.com>
Tue, 16 Mar 2010 15:26:54 +0000 (18:26 +0300)

Trivial merge