merge of '002eda28acb76c39ae5920ebf07cf3756277bd37'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 6 Jun 2008 11:30:11 +0000 (11:30 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 6 Jun 2008 11:30:11 +0000 (11:30 +0000)
commit435805be2cfb725ea743a2f4b95b56e78ecc6aed
tree748871d026b154e7baf6f8ec8a7e653d3df51574
parent9c542668b5aaafc69e68a636af6ecd4448d9fcbc
parent8f358c5386d741bc1a91d05ae240c88544269ff9
Merge ... '002eda28acb76c39ae5920ebf07cf3756277bd37'
     and '7cdf64b464cc0539a2bd9f5642023ac33825ebc5'