merge of '296ff29bfd956e25378dc4b3d757bfe71b1010d5'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 20 Oct 2006 11:55:16 +0000 (11:55 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 20 Oct 2006 11:55:16 +0000 (11:55 +0000)
     and '9a74dad27351d4893343978ef329c84a1fc7dbfb'


Trivial merge