merge of 3dae055f5bf6d49d626cfcf0a8062c4c979aaeb2
authorMichael Lauer <mickey@vanille-media.de>
Wed, 25 Oct 2006 23:36:15 +0000 (23:36 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 25 Oct 2006 23:36:15 +0000 (23:36 +0000)
     and ecc737f0c1718588d8ed3722d6156d3c676fed6b


Trivial merge