merge of '9ee75dbc81277b54460c4e8c5212693a1fb2fd03'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 14 Aug 2007 17:40:12 +0000 (17:40 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 14 Aug 2007 17:40:12 +0000 (17:40 +0000)
commit454ad7e3241f209286a4f06d928b7e6d5ff732cd
tree716a3c2a4680252eddef4eb3a41ce68b2e608d7b
parenta63a0c1fd6bdbacea0300ae94dcc14ca097a6724
parent0e7d6abf2db55df036eca588dd3a10c8f921e35b
Merge ... '9ee75dbc81277b54460c4e8c5212693a1fb2fd03'
     and 'ab50357e49cac0db516d16c090278324f3999d80'