merge of '8e8a1c48faec2dc479cec1aee6c9031525ea9306'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 23 Jan 2008 16:57:37 +0000 (16:57 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 23 Jan 2008 16:57:37 +0000 (16:57 +0000)
commit2e3d17710c3059dce30901211439ce5124f0372d
treef393eae35b16a2c3d84c492eddf52bedde582554
parent32e4437d07d5b68f6c7020a5af2a1ca5f767b410
parent602717bfc8d5cafa6c158d1b34091eec6f78de21
Merge ... '8e8a1c48faec2dc479cec1aee6c9031525ea9306'
     and 'ec7917dc2ea4817a839295ebf8a8cb597ebb04ff'