Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Jemerov <yole@jetbrains.com>
Thu, 20 Jan 2011 19:25:22 +0000 (20:25 +0100)
committerDmitry Jemerov <yole@jetbrains.com>
Thu, 20 Jan 2011 19:25:22 +0000 (20:25 +0100)

Trivial merge