merge of 'd486b07ff3f411bc579cba692283881327e49742'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 6 Aug 2007 19:31:33 +0000 (19:31 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 6 Aug 2007 19:31:33 +0000 (19:31 +0000)
     and 'd80fca2b777ef3a788e49ac766b51ac24e27b4fa'


Trivial merge