merge of '2189b3da22533b6434462b5c6979a74557c37494'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 30 Sep 2008 15:19:01 +0000 (15:19 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 30 Sep 2008 15:19:01 +0000 (15:19 +0000)
     and 'd03a9a17ed9edfe3cfe1ae0cf6e589d38d28e23f'


Trivial merge