merge of '669bdfc0ca89598b9e5d56d8c2a7df2ad055c0b2'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 15 Aug 2007 23:03:05 +0000 (23:03 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 15 Aug 2007 23:03:05 +0000 (23:03 +0000)
     and '91d8f0c9c1e51e85470236a1a95ad046ba02f569'


Trivial merge