merge of '65fb29ae308602940228134ed6cbae42627b7c1e'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Sun, 12 Aug 2007 22:00:43 +0000 (22:00 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Sun, 12 Aug 2007 22:00:43 +0000 (22:00 +0000)
commit3945a4760d0223baf60983c4857a6b51ac66981d
tree45c60838f6fc79af2d96fcc4773ab9c2f9cc9ca4
parent53d81ff9ad3de44359a36ac5255d28182df4599e
parentb9a30358ae133ede815cbf2c4b31ff1977035e30
Merge ... '65fb29ae308602940228134ed6cbae42627b7c1e'
     and '7a67ee2faf59e6803887617211f99fcc2f9cf4e7'