merge of '3c603fa45cf43613ab6041072798d5fbe162e6f3'
authorRichard Purdie <rpurdie@rpsys.net>
Thu, 2 Nov 2006 00:00:40 +0000 (00:00 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Thu, 2 Nov 2006 00:00:40 +0000 (00:00 +0000)
commit342be6a73e841f839fabd7c5bbf589b0d925e334
tree4be247e652124d62c7c858f5f1e11abeb993d86e
parent0e1504b64afdde10de084393d1c2feac6b3ea98b
parenta4564f871d82cd74c7cabee88855658b435e5bb6
Merge ... '3c603fa45cf43613ab6041072798d5fbe162e6f3'
     and 'b125865ca3f9be3fcd9bd2cf94915c3b0ac3f070'