merge of c1656691540333cfa24d768dfa15b6c02ea73ac5
authorMichael Lauer <mickey@vanille-media.de>
Sun, 22 Oct 2006 13:31:14 +0000 (13:31 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 22 Oct 2006 13:31:14 +0000 (13:31 +0000)
     and fd56b82c42943805000e3f8fb010ecb848d951ef


Trivial merge