Merge branch 'master' of git.labs.intellij.net:idea/community 94.42
authorAlexey Pegov <alexey.pegov@jetbrains.com>
Tue, 22 Dec 2009 16:47:53 +0000 (19:47 +0300)
committerAlexey Pegov <alexey.pegov@jetbrains.com>
Tue, 22 Dec 2009 16:47:53 +0000 (19:47 +0300)

Trivial merge