merge of '384c03fc9086edbfe62961d2a403edd22aa3e820'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 20 Aug 2007 13:23:03 +0000 (13:23 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 20 Aug 2007 13:23:03 +0000 (13:23 +0000)
     and 'f5ea07728cfa7bdf07cae1c5d718a57488f84b6e'


Trivial merge