merge of '802e060fdcc7fa600a6f20b2de68a01d0e340e51'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 30 Jul 2007 21:38:25 +0000 (21:38 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 30 Jul 2007 21:38:25 +0000 (21:38 +0000)
     and 'b473108bc7e5f11f7f14d9c0c2842e1a2a91c0b9'


Trivial merge