merge of 1ce847551d29aa89a9004dbe9df99547f6f93e3f
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 18 Aug 2006 13:47:57 +0000 (13:47 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 18 Aug 2006 13:47:57 +0000 (13:47 +0000)
commitdda1a06bbaade27517b702ed1cc7e50f3e464c9c
treee082ccfc4f70393717f3662031474d2420514fb3
parenta72f18cad2f1e5ab0aaf2284ee4e4b50ef935651
parent873465e00ac77ae50c4c6bc8674f71f2a3985197
merge of 1ce847551d29aa89a9004dbe9df99547f6f93e3f
     and f8625e808b1d66ff2a469a04339e27914d59c4e5