merge of '6104c95bf5e75fc92d17f6e04a7c37a6efbb147f'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 14 Jan 2008 14:06:24 +0000 (14:06 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 14 Jan 2008 14:06:24 +0000 (14:06 +0000)
     and 'f7a565e7e910cea46808ec61590556a6b97dff74'


Trivial merge