merge of '66573a06c1ee62e38d70a6c82f8d99a41243cd5c'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 6 Jul 2007 16:35:29 +0000 (16:35 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 6 Jul 2007 16:35:29 +0000 (16:35 +0000)
commite34549a799d81d44d9ae23706c035618494051cf
tree986072b097e720e37a7988336342ce52ee4f2f6c
parent4b37859e36525c4902b0f8f22c6cdc6339958171
parent7a404f4a4f1a5b2855b000d83a4ce01328b7dc93
Merge ... '66573a06c1ee62e38d70a6c82f8d99a41243cd5c'
     and '77ccc19a41dcb49d566dc709b5d6a8a4043567b4'