merge of '27e74ef96f09a42940bdd926f11c1d423d1e1eba'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 2 Nov 2007 12:08:03 +0000 (12:08 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 2 Nov 2007 12:08:03 +0000 (12:08 +0000)
     and 'edb8cd28fd8376663f333ba190c7e25b5ebf3794'


Trivial merge