Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorEugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Wed, 3 Mar 2010 18:13:30 +0000 (21:13 +0300)
committerEugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Wed, 3 Mar 2010 18:13:30 +0000 (21:13 +0300)

Trivial merge