merge of '787c9500fd515ecad11ceaa1f7b49e5e1c70006f'
authorRichard Purdie <rpurdie@rpsys.net>
Fri, 7 Mar 2008 17:52:43 +0000 (17:52 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Fri, 7 Mar 2008 17:52:43 +0000 (17:52 +0000)
commit2b4b7222dfcf2e08c502c5dd3c7c005cc281bac6
treec237ad3963b6580c447fec41ab5de6ab8be23bdd
parent89c29837788a5ded6c71ce3f834fe3f8e7a9cba0
parent520987444e2a1ce9e8c81fa728610591c5e563d4
Merge ... '787c9500fd515ecad11ceaa1f7b49e5e1c70006f'
     and '93c08db0250845bf12c335e4a53413860bbe6dfb'