merge of '6532e26aa38ae6a2b6f815a67a5c317d6fe32c3f'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 7 Feb 2007 16:31:13 +0000 (16:31 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 7 Feb 2007 16:31:13 +0000 (16:31 +0000)
commit77d71931684db18dacb648a9dd2f804829983df4
treea7e234d76b9956b88abacbfd771af671284a5783
parenta71b5c88a4d09cc9988d3c1425c9f92813f3b6d9
parentb09a67c2da336338d76df5dde8fb400e9f0fd38e
Merge ... '6532e26aa38ae6a2b6f815a67a5c317d6fe32c3f'
     and 'ceb628b9d1e93ba31a266b15bf06b5527054eaf3'