merge of '4628d4ecb47157250aa2bda58f024a5abc413eff'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 7 Mar 2007 15:29:07 +0000 (15:29 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 7 Mar 2007 15:29:07 +0000 (15:29 +0000)
commit455dbfd2345cb072bff69b981e18a498aab54a3c
tree2d715ac5ac7e100edd08f463c572e87429a047de
parentb461fd2742cfc579fba9fe5a4f6d065fb422edee
parent759cb91c146f7ce344ade0e3c4d98bbae0d38b0d
Merge ... '4628d4ecb47157250aa2bda58f024a5abc413eff'
     and 'f08623e938f9152f6bb6ce2389d6fdac3b1215c0'