Merge branch 'master' of git.labs.intellij.net:idea/community
authorDmitry Jemerov <yole@jetbrains.com>
Mon, 29 Nov 2010 12:38:43 +0000 (15:38 +0300)
committerDmitry Jemerov <yole@jetbrains.com>
Mon, 29 Nov 2010 12:38:43 +0000 (15:38 +0300)

Trivial merge