Merge branch 'master' of git.labs.intellij.net:idea/community
authorAlexey Pegov <alexey.pegov@jetbrains.com>
Mon, 1 Mar 2010 12:20:50 +0000 (15:20 +0300)
committerAlexey Pegov <alexey.pegov@jetbrains.com>
Mon, 1 Mar 2010 12:20:50 +0000 (15:20 +0300)

Trivial merge