merge of '676ed5b61806189cd1aeea21920d3c8fa842f8c7'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 7 Jan 2008 23:55:54 +0000 (23:55 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 7 Jan 2008 23:55:54 +0000 (23:55 +0000)
     and 'f556521018478109967b108bb830f8109aefbb0e'


Trivial merge