merge of 'ca79cbe803b8aa5bd6d3ebe944504e5af8234d59'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 10 Aug 2007 08:33:56 +0000 (08:33 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 10 Aug 2007 08:33:56 +0000 (08:33 +0000)
     and 'fc9df3f6bc3d16669463fde20e46e8b5a683ad84'


Trivial merge