merge of '626cf4325c0654b9580525c44fc4b4a1eef602f2'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 11 Jan 2007 22:47:42 +0000 (22:47 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 11 Jan 2007 22:47:42 +0000 (22:47 +0000)
     and '864030c30acdb89f49bcfbd4707a4a16dcfb2b53'


Trivial merge