merge of '08caa01fe78b735fde2c7ca902bf7bfeb6075ff7'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 23 Oct 2006 17:16:07 +0000 (17:16 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 23 Oct 2006 17:16:07 +0000 (17:16 +0000)
     and 'fb2a1b3eb36c91c1ab88e790f436f8c166ab7a7f'


Trivial merge