merge of '1887e05997e5d1f748a52eec6b2d13c49a073d4c'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 30 Dec 2007 16:44:17 +0000 (16:44 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 30 Dec 2007 16:44:17 +0000 (16:44 +0000)
     and '3097cec884e81b132a9e898dffce71a333d6484c'


Trivial merge