merge of '4b947022d295cf54343e477171aae5c39c73865f'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Sep 2006 21:20:30 +0000 (21:20 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 19 Sep 2006 21:20:30 +0000 (21:20 +0000)
     and '59ea48e552117b87f1c03767f7f608bf3e852fc4'


Trivial merge