merge of '2f3182e242be826a1109001af42d7184d320ca4a'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 7 Aug 2007 20:14:09 +0000 (20:14 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 7 Aug 2007 20:14:09 +0000 (20:14 +0000)
     and 'e609b6a9ff4128a148102c97d991816ec7782504'


Trivial merge