merge of '3a81a92297b91a0316a744c06361a9cdf470ede8'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 8 Mar 2007 11:25:47 +0000 (11:25 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 8 Mar 2007 11:25:47 +0000 (11:25 +0000)
commit7db8984b275181a30ec7fcc47e2b78dbfe1ca698
treeb0d614dd3490f2a79bfe67496033278531f913ef
parentf86643c366f641c34d8050fde2576007709d7c40
parent8da86c82cf296fe0df95523f22b5ba36d36691bf
Merge ... '3a81a92297b91a0316a744c06361a9cdf470ede8'
     and '40bad367ae1fefd425dbef847df2559f3b436b7d'