merge of '0168c99658bc90098d3e7ce80e7ada8c166dc75a'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 13 Oct 2006 13:12:22 +0000 (13:12 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 13 Oct 2006 13:12:22 +0000 (13:12 +0000)
     and '9614071a6fe02cbe1635e02b64ed6d2535c9cbdc'


Trivial merge