merge of '7bb175794c76c6b9b785835fe714b7e4e489206c'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 14 Sep 2007 15:24:20 +0000 (15:24 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 14 Sep 2007 15:24:20 +0000 (15:24 +0000)
     and 'e22359507956c45e7ed998bce3e90f6db8c81ecf'


Trivial merge