merge of 'dd31500500238107a50637418ba3f63cb4b36a7d'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 20 Aug 2007 14:22:33 +0000 (14:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 20 Aug 2007 14:22:33 +0000 (14:22 +0000)
     and 'fd51b44f85d35014e5287bedc536e9abcbf56cad'


Trivial merge