merge of 'd9a7dd0081361f783c4c47de77596d085c151416'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 14 Jun 2007 07:19:53 +0000 (07:19 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 14 Jun 2007 07:19:53 +0000 (07:19 +0000)
     and 'e4ceeb027359e3758975231e04d3ebb40a674053'


Trivial merge