merge of '24b8202a233fbef98ec2f7f85d4702688c1b951d'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 24 Oct 2007 00:40:44 +0000 (00:40 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 24 Oct 2007 00:40:44 +0000 (00:40 +0000)
     and '2ebd940d98ad52f4e6d4972f53b6a358d0e845c5'


Trivial merge