Merge branch 'master' of git.labs.intellij.net:idea/community
authorsweinreuter <sascha.weinreuter@gmail.com>
Tue, 8 Dec 2009 09:35:01 +0000 (10:35 +0100)
committersweinreuter <sascha.weinreuter@gmail.com>
Tue, 8 Dec 2009 09:35:01 +0000 (10:35 +0100)

Trivial merge