merge of '7ebcf65940382b7ebea258189704cb0e4a77dc70'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 29 Feb 2008 15:59:47 +0000 (15:59 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 29 Feb 2008 15:59:47 +0000 (15:59 +0000)
     and 'ae9980c1d055e682beb2fea6cfddb080c495b43b'


Trivial merge