merge of '2dbe8d19c2e0b6dfda1f3acddb9f778f0711d4a0'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 26 Jul 2007 14:13:31 +0000 (14:13 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 26 Jul 2007 14:13:31 +0000 (14:13 +0000)
     and '8219b55031fbe63e3c3d0da9bb3ba9f142467029'


Trivial merge