merge of '5b06f0eb5e960e760e2621fc769e25d326372fb6'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 18 Feb 2008 20:07:28 +0000 (20:07 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 18 Feb 2008 20:07:28 +0000 (20:07 +0000)
     and '8b854b2b358a134500f7b4e1826c4fab2dc417ed'


Trivial merge