merge of '16dcbcac515f688b9e5c38ab8ad41abc9a570d38'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 21 Jun 2007 09:00:58 +0000 (09:00 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 21 Jun 2007 09:00:58 +0000 (09:00 +0000)
     and '3593b91506b1898a310d8990f6cbc8781d3712fd'


Trivial merge