merge of 'c231987751696ab580afb27261789a5becb2c0bd'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 11 Sep 2007 23:50:02 +0000 (23:50 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 11 Sep 2007 23:50:02 +0000 (23:50 +0000)
     and 'c3f0afcb1172d319278bd0ef4ba8c811cab4ada2'


Trivial merge