merge of '4cdf2bbe0fc7b789810df60b02beff2b35c94877'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 8 Aug 2007 10:48:54 +0000 (10:48 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 8 Aug 2007 10:48:54 +0000 (10:48 +0000)
commit4e63bfd7754b8366b19d4182aa24af4798fcc60a
treef3899ac77a49c5db3e4efdd533295e155fe02d48
parentbe531163db80ed4a2f10c4e6725b8706ea754f3a
parent75ece19d79d8bc4016ca410161c2c818aede0c13
Merge ... '4cdf2bbe0fc7b789810df60b02beff2b35c94877'
     and 'bacc3c96b6e486deae2dc054f9eafdfa75b6e618'