merge of '93ee90ab50c3c8b253484466785fc6af7584f05a'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 14 Sep 2007 00:53:45 +0000 (00:53 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 14 Sep 2007 00:53:45 +0000 (00:53 +0000)
     and 'c3c391eb3a506332e2baf39f0412a362bf17add8'


Trivial merge