Merge branch 'master' of git.labs.intellij.net:idea/community
authorAlexey Pegov <alexey.pegov@jetbrains.com>
Wed, 7 Apr 2010 14:49:07 +0000 (18:49 +0400)
committerAlexey Pegov <alexey.pegov@jetbrains.com>
Wed, 7 Apr 2010 14:49:07 +0000 (18:49 +0400)

Trivial merge