merge of 14bd8d9b654cd46ec71ba3b5312ad1d28ec2550e
authorMichael Lauer <mickey@vanille-media.de>
Sat, 21 Oct 2006 21:38:31 +0000 (21:38 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 21 Oct 2006 21:38:31 +0000 (21:38 +0000)
     and dd230f1511e357183e0d179a16d60af7265a8cf1


Trivial merge