Merge branch 'master' of git.labs.intellij.net:idea/community
authorpeter.gromov <peter@jetbrains.com>
Thu, 30 Sep 2010 14:31:30 +0000 (18:31 +0400)
committerpeter.gromov <peter@jetbrains.com>
Thu, 30 Sep 2010 14:31:30 +0000 (18:31 +0400)

Trivial merge