merge of '329df9dc9aeb10de474ddef3143523dd49e8ce6a'
authorMichael Lauer <mickey@vanille-media.de>
Thu, 16 Aug 2007 22:22:50 +0000 (22:22 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Thu, 16 Aug 2007 22:22:50 +0000 (22:22 +0000)
     and '4d580f70318d589b28c525479b598a0fec9dc64b'


Trivial merge