merge of '3ecc917729c94ee2f23b012b99f74a8a524154c2'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 18 Sep 2007 00:39:05 +0000 (00:39 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 18 Sep 2007 00:39:05 +0000 (00:39 +0000)
     and 'cc4ff44ab8858d40dac79ae6b3e11d75dbd68c10'


Trivial merge