merge of '719de3c75109455b02f16d45f275877124af83ac'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 24 Sep 2008 05:05:38 +0000 (05:05 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 24 Sep 2008 05:05:38 +0000 (05:05 +0000)
     and 'acf7a68b5073d3f7ac4300d238187222e6f4c702'


Trivial merge