merge of 'c5d7d939915c058ea8efba4e6e2fa2e5f1648626'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 6 Nov 2007 15:16:38 +0000 (15:16 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 6 Nov 2007 15:16:38 +0000 (15:16 +0000)
commitf0eb3fa507e436d44b943bedfcd8afa5ff760971
tree15a57fffc1a01825821f35508fc84ce2a08fd93e
parent51d30ada0db9ff322925628fe9d965687685f52d
parentb8a64f32a1bd74900ef43067e40fa1153c5f27cc
Merge ... 'c5d7d939915c058ea8efba4e6e2fa2e5f1648626'
     and 'd6978786d6310b56cb0f5a93790659cd481ca0d5'