merge of '90fdf0ac19d7e035c60649e9885973e7f8d0a281'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 3 Aug 2007 16:28:04 +0000 (16:28 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 3 Aug 2007 16:28:04 +0000 (16:28 +0000)
commit38ddcd6d8a585ad7da6db319518c6b55a4ddca14
treeb2b40553b2d8e8ac14ab4de748d2130e2b4434eb
parent6ac754c8557bc8675ec9a8bddbe92e7c9e6b66a5
parent497fd79f60f8258a569308e756ddfe4db700ce16
Merge ... '90fdf0ac19d7e035c60649e9885973e7f8d0a281'
     and 'f9e7fa374cd5f676b9b1a53975d8a55b54caa2c3'