Merge branch 'master' of git.labs.intellij.net:idea/community 94.330
authorBas Leijdekkers <leijdekkers@carp-technologies.nl>
Tue, 16 Feb 2010 21:21:34 +0000 (22:21 +0100)
committerBas Leijdekkers <leijdekkers@carp-technologies.nl>
Tue, 16 Feb 2010 21:21:34 +0000 (22:21 +0100)

Trivial merge