merge of '08caa01fe78b735fde2c7ca902bf7bfeb6075ff7'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 23 Oct 2006 17:16:07 +0000 (17:16 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 23 Oct 2006 17:16:07 +0000 (17:16 +0000)
commit0d6366b500dfe1ab4ee228d4a180729dcf49c713
tree36558266898b501a016ef6e27cdfe1ee38e455b7
parent670fac2ceab46c1970dcb22019361186f857db8e
parente0d8153e5ced79a3cace0ba249de6875e6cc2439
Merge ... '08caa01fe78b735fde2c7ca902bf7bfeb6075ff7'
     and 'fb2a1b3eb36c91c1ab88e790f436f8c166ab7a7f'