merge of '8ed4f745361c3a5e363b7efaa73ba59ef8bc8031'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 15 Jan 2007 17:54:45 +0000 (17:54 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 15 Jan 2007 17:54:45 +0000 (17:54 +0000)
     and 'b713540faed8dc1c9b7eb055d91e3eaef321b79f'


Trivial merge