merge of '390f4dbb9cf6d095a35cd58c7e953fa2e81d669c'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 16 May 2007 13:37:52 +0000 (13:37 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 16 May 2007 13:37:52 +0000 (13:37 +0000)
commit5951a9d7e48dc4b426460917dec370b687ac4756
tree62ede39cc1625aa6b7e091427f7ecdc54b476436
parent936fee1007ebf0dcefec063c82a67209d860374c
parent9d29605f69008d5f3f127d719b5d1a083bdbe899
Merge ... '390f4dbb9cf6d095a35cd58c7e953fa2e81d669c'
     and 'a95a056b69a8ed26e917be38a293dbe5f7bb97c3'