merge of '7a689ee422b77b79d4b13b0d7a7c7060c257c930'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 10 Mar 2008 13:50:26 +0000 (13:50 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 10 Mar 2008 13:50:26 +0000 (13:50 +0000)
commita49dbef3f2322955d6d4ad59021facb240867713
tree64101f38f9bcc620b6d4e4e95064fa76dfa496c8
parent75026ab34ab6dd2d15bb02e8c8321f49a9c67d2d
parenteb28e77b2310ed170d8173371f80c09a50c741b0
Merge ... '7a689ee422b77b79d4b13b0d7a7c7060c257c930'
     and '8fbb3c656df4e525b0de65e241599ee4cf1b2658'