merge of '7c5d468e4126d275fd4f17ccdc3a160b3e0b09a5'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 28 Aug 2007 01:25:15 +0000 (01:25 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 28 Aug 2007 01:25:15 +0000 (01:25 +0000)
     and '9e3f287c579cb592207f2e225ab8735174982867'


Trivial merge