Merge branch 'master' of git.labs.intellij.net:idea/community
authorunknown <cdr@.Labs.IntelliJ.Net>
Tue, 19 Jan 2010 07:32:06 +0000 (10:32 +0300)
committerunknown <cdr@.Labs.IntelliJ.Net>
Tue, 19 Jan 2010 07:32:06 +0000 (10:32 +0300)

Trivial merge