merge of '6fcfd7c187e5bfdb019983b87124ddc80af2462d'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 16 Oct 2006 10:40:04 +0000 (10:40 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 16 Oct 2006 10:40:04 +0000 (10:40 +0000)
commit4d5766571ab5a002eacce9784fca5c59d9040210
tree5ae7a19989ebee023c350dfd3d5e122d5f8b079e
parenteebefa5660ca2fc72c89bee0758c415618e344f8
parent12144a87891f5d08b84aebab20d5e97815403914
Merge ... '6fcfd7c187e5bfdb019983b87124ddc80af2462d'
     and '9e9e3622c67f2361a31af731db0685c576144665'