merge of '7dac8ac92aeba65ca1a74b6ff34b5bcfce5d6ee2'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 8 Aug 2007 11:22:57 +0000 (11:22 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 8 Aug 2007 11:22:57 +0000 (11:22 +0000)
commit30465a5a5c773c1d8d30e17621e950e78088d5ea
treed1b86b85d913057c33a5ce30e4dc61c73aec6600
parent4f70d1386bb1441b86ce14ca5f4b0d98d7f267dd
parentdac9996698abbf10b95ff0e90dc762882a566c91
Merge ... '7dac8ac92aeba65ca1a74b6ff34b5bcfce5d6ee2'
     and '87682066586eade9fec532c4e17ea6c8b242428d'