Merge branch 'master' of git@git.labs.intellij.net:idea/community
authorAlexey Kudravtsev <cdr@intellij.com>
Wed, 30 Sep 2009 12:10:35 +0000 (16:10 +0400)
committerAlexey Kudravtsev <cdr@intellij.com>
Wed, 30 Sep 2009 12:10:35 +0000 (16:10 +0400)

Trivial merge