merge of '17f165259b5092d4fb5def6145d429af967f491a'
authorMichael Lauer <mickey@vanille-media.de>
Tue, 23 Oct 2007 08:15:32 +0000 (08:15 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Tue, 23 Oct 2007 08:15:32 +0000 (08:15 +0000)
     and '63916b741165f48e46f4d9b000ec2b036ff1beb4'


Trivial merge