merge of df84e8f6ddb4607c824cd8dbc63c44ffbb308f9a
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 21 Aug 2006 00:25:31 +0000 (00:25 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 21 Aug 2006 00:25:31 +0000 (00:25 +0000)
commit31647657057494a96cf6ae9e86700b3f15b9938b
treec6b2a0fbbc14a9d27b2b4b9ce823b8234c966db5
parent959a8d0369208ec82a46f14e265dd8ab58668ef9
parentb75d4a8e52a3d982b95bd082337fdd23ba55fcac
merge of df84e8f6ddb4607c824cd8dbc63c44ffbb308f9a
     and 3608f3d5434271fde9ce2b2c787339675d8a532f