merge of '377e4d7bcf91440bd806ee920d1b7ff72c44b991'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 21 Jul 2008 00:21:09 +0000 (00:21 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 21 Jul 2008 00:21:09 +0000 (00:21 +0000)
commitfa4eb48f75758f1e38948a6e3539bcd0c1e40200
treec8f5e4212f03f9a86dfc9946814d99c7483e9786
parent2a10b31ff00050bb4cece8ab90ec25ed55f59fae
parent7e0a1576c8bae32c418a5fab4d7c936ecee814f6
Merge ... '377e4d7bcf91440bd806ee920d1b7ff72c44b991'
     and '4e488d5362b8ca358d51ff94ae13612013485641'