merge of '2ee8158109b81fad266d6373b64175e13ea659e4'
authorMichael Lauer <mickey@vanille-media.de>
Sat, 3 May 2008 22:44:02 +0000 (22:44 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 3 May 2008 22:44:02 +0000 (22:44 +0000)
     and 'f2a34edab33cdaedb8303991dc23cc54c1c370ff'


Trivial merge