merge of 0b5e6bdf56efa0e135a5c541490fd6bfdbe9c8d0
authorMichael Lauer <mickey@vanille-media.de>
Mon, 2 Oct 2006 18:09:04 +0000 (18:09 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 2 Oct 2006 18:09:04 +0000 (18:09 +0000)
     and b4ec3864cbd2f012682dcfb6d013d215a83b72df


Trivial merge