merge of 'b2f17b7b5e7d3d3578983194a6e5733cc0d72d2b'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 8 Oct 2008 14:13:03 +0000 (14:13 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 8 Oct 2008 14:13:03 +0000 (14:13 +0000)
     and 'c03724e1451ef9439e526ac8b27ec4af5defecf9'


Trivial merge