merge of '58bcdff88bb0b8e65ab6272fba2d3c6295d40558'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 19 Mar 2007 14:33:25 +0000 (14:33 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 19 Mar 2007 14:33:25 +0000 (14:33 +0000)
     and '86cc8bea1064989f059492e80b1cb64624464b9f'


Trivial merge