merge of 'cdb2e28e89c82aad619cd71c60829800e4dd8d0b'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 31 Oct 2007 12:13:24 +0000 (12:13 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 31 Oct 2007 12:13:24 +0000 (12:13 +0000)
commitaf2af587b97f17fe8d5aac3b81cc061ec6fa16a9
treeef959507e1d8e21a340c0d75c1735c52d83249b4
parentf85953aaa329431ef789c40c27e8bcc8c242aa96
parent02fa6e148736885099b67b5570819cf1eec59a5a
Merge ... 'cdb2e28e89c82aad619cd71c60829800e4dd8d0b'
     and 'eca725be04182c9d2ebab13eddbe22f7e48c2b17'