Merge branch 'master' of git.labs.intellij.net:idea/community
authorAlexey Pegov <alexey.pegov@jetbrains.com>
Wed, 25 Nov 2009 16:28:57 +0000 (19:28 +0300)
committerAlexey Pegov <alexey.pegov@jetbrains.com>
Wed, 25 Nov 2009 16:28:57 +0000 (19:28 +0300)

Trivial merge