merge of '16ddc63cc58ab4f6ac83a2e1d653c740ffdd6f87'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 30 Aug 2007 22:36:16 +0000 (22:36 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 30 Aug 2007 22:36:16 +0000 (22:36 +0000)
     and '76b3eaaf78af7bef8ae185d70ad72a4c8f9a3af7'


Trivial merge