merge of '985da843108cf6ed11892842f921418171e3d429'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 20 Feb 2008 16:33:31 +0000 (16:33 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 20 Feb 2008 16:33:31 +0000 (16:33 +0000)
     and '9a694dbde6dd96803bccae08f8e83850e03f2b58'


Trivial merge