Merge branch 'master' of git.labs.intellij.net:idea/community
authorAlexey Pegov <alexey.pegov@jetbrains.com>
Mon, 26 Jul 2010 10:04:55 +0000 (14:04 +0400)
committerAlexey Pegov <alexey.pegov@jetbrains.com>
Mon, 26 Jul 2010 10:04:55 +0000 (14:04 +0400)

Trivial merge