Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Fri, 25 Dec 2009 06:57:41 +0000 (09:57 +0300)
committerDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Fri, 25 Dec 2009 06:57:41 +0000 (09:57 +0300)

Trivial merge