merge of '13e5ed574ff68fd3103e4c1f055e4a3704124d00'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 23 Aug 2007 09:45:35 +0000 (09:45 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 23 Aug 2007 09:45:35 +0000 (09:45 +0000)
     and '3c0d5598d4768723f8ae136268f15cc2a98c7e77'


Trivial merge