merge of '24a01b709a1340721c80ac90b928ab9d4e1ea0be'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 25 Aug 2008 22:23:24 +0000 (22:23 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 25 Aug 2008 22:23:24 +0000 (22:23 +0000)
     and '60842b466603b662ce4ff57d65e2d0ff713c018e'


Trivial merge