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)
commit65756ffdda79ffcd4ca8c9988e4f8cb40f91f81f
tree316e5623e7b860ceb92caf723b0944fc872a4ce5
parentb538ed9fe1b37ef740145b4399db0048ad31fc8c
parent1aeb81320d30622f09609f5569d302d527b3cef7
Merge ... '329df9dc9aeb10de474ddef3143523dd49e8ce6a'
     and '4d580f70318d589b28c525479b598a0fec9dc64b'