merge of '1e9547d3fd33d249bb3cdd7e7a4670cfcbb11310'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 23 Jan 2008 21:47:24 +0000 (21:47 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 23 Jan 2008 21:47:24 +0000 (21:47 +0000)
     and 'f4e5cfc232e8f1488452378938ddaa3b3fc3d4a6'


Trivial merge