merge of '6c10e4e698bad3b70189cebcd53c4381ae45b884'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 23 Apr 2007 16:46:28 +0000 (16:46 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 23 Apr 2007 16:46:28 +0000 (16:46 +0000)
commita9df5ade468b65513a1322184c6ba43e94181d0e
treea95c739afc1da9f0e012215fc93b49cad9ebbad3
parente16fb74421e04040417a417208bc9d8e5d01e350
parentd9f0c399c1afb4bb50e860370fd3adae82c7d34f
Merge ... '6c10e4e698bad3b70189cebcd53c4381ae45b884'
     and '909c507b800748c820ddc73a2c5bed204cbdbd65'