merge of '30c320b2f51c86226580e5bbf68fa8b0896a0655'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 12 Jun 2007 14:45:27 +0000 (14:45 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 12 Jun 2007 14:45:27 +0000 (14:45 +0000)
commitb1f4d34f8541f039d72d423223c91e32540a2fc5
treec50f34a595a58cb31a25d96727c3e2c9c27c0a91
parent10013e9ed4e79a2f6ca0ceb6451787aaa47c46e5
parentb655c71aac44af6eab2a52774ea810a945592cee
Merge ... '30c320b2f51c86226580e5bbf68fa8b0896a0655'
     and '8dfee9b2427785432e4161eb7cc749155230e08e'