Merge branch 'master' of git.labs.intellij.net:idea/community
authorAlexey Pegov <alexey.pegov@jetbrains.com>
Mon, 9 Aug 2010 16:17:59 +0000 (20:17 +0400)
committerAlexey Pegov <alexey.pegov@jetbrains.com>
Mon, 9 Aug 2010 16:17:59 +0000 (20:17 +0400)

Trivial merge