merge of '05e9902f277de28b4e08c6bb6aff89f8862b84ac'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 17 Jul 2008 19:04:31 +0000 (19:04 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 17 Jul 2008 19:04:31 +0000 (19:04 +0000)
commit7e0a1576c8bae32c418a5fab4d7c936ecee814f6
tree3f90f88a34caece6cf3b9bb7d0f1fe021a4a1078
parent6585d160cdf126f48562d2ceb3ed2eb38aed2ace
parentfcbe107913b10643d1ba8ac137de273e12e8854a
Merge ... '05e9902f277de28b4e08c6bb6aff89f8862b84ac'
     and '912f388483a3e1703ca89d7b2309723fd3407420'