merge of '4c79780fdaece8e6888a1693a01627da28f7072a'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 22 Oct 2007 04:02:30 +0000 (04:02 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 22 Oct 2007 04:02:30 +0000 (04:02 +0000)
     and '56f71aa4e55e5e8bce8d34f80b7adc9bf51fb187'


Trivial merge