merge of 296e66426511a2f435ec31779df775a4464ac37a
authorMichael Lauer <mickey@vanille-media.de>
Fri, 11 Aug 2006 20:38:22 +0000 (20:38 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 11 Aug 2006 20:38:22 +0000 (20:38 +0000)
     and 4272cf6c19f128a083eb5c5886cdcc75a1b0818c


Trivial merge