Merge branch 'master' of git.labs.intellij.net:idea/community
authorAlexey Pegov <alexey.pegov@jetbrains.com>
Tue, 29 Sep 2009 14:29:46 +0000 (18:29 +0400)
committerAlexey Pegov <alexey.pegov@jetbrains.com>
Tue, 29 Sep 2009 14:29:46 +0000 (18:29 +0400)

Trivial merge