merge of eb7d96a0afd303253a978ec21808298060b90fc2
authorMichael Lauer <mickey@vanille-media.de>
Sat, 5 Aug 2006 10:29:42 +0000 (10:29 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sat, 5 Aug 2006 10:29:42 +0000 (10:29 +0000)
     and f01470a8f69abdfa702a7b6f512c94c9821e4ac7


Trivial merge