merge of 'ad5346155c810928977e1056761f7e6de5142de2'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 8 Mar 2008 15:47:35 +0000 (15:47 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 8 Mar 2008 15:47:35 +0000 (15:47 +0000)
     and 'feafcb12f6ebb596d3500f718255df081a8c8f5a'


Trivial merge