merge of 'c05229a8c5246cada336c3cfe5a3417367366836'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Aug 2008 17:40:05 +0000 (17:40 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 19 Aug 2008 17:40:05 +0000 (17:40 +0000)
     and 'ef9cb35b2ec71124443e3492f55fe842c40ba66e'


Trivial merge