merge of 'a5ebc4455c08465bb3119b12db3f0a95ef0ee51a'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 8 Nov 2007 15:52:40 +0000 (15:52 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 8 Nov 2007 15:52:40 +0000 (15:52 +0000)
     and 'abd46ad11dd10c36a511a2d3d6867a6fb20076ca'


Trivial merge