merge of '6784a6b701f00708668a4025f803a9342e7ccbdf'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 21 Jun 2007 03:43:21 +0000 (03:43 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 21 Jun 2007 03:43:21 +0000 (03:43 +0000)
     and 'a1d9bb1b5ffce63159a1d8a542921bdbc87ec8d8'


Trivial merge