merge of '05cc5d66198a3d72159d333ad23069009f5c5cda'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 8 Aug 2007 12:38:03 +0000 (12:38 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 8 Aug 2007 12:38:03 +0000 (12:38 +0000)
     and '54fa1e3c0521ed472d0150900302a759edeb5c95'


Trivial merge