merge of '3bc048bb553b64eaf0567c44a7b375930a42b5af'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 7 Aug 2007 10:46:54 +0000 (10:46 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 7 Aug 2007 10:46:54 +0000 (10:46 +0000)
     and '64cb3a9bf1c0275166bc2bd9550ea0eec67a60b6'


Trivial merge