merge of '26ab4051ec6ee9153656e1ea57a1ea5c53aad6ce'
authorRod Whitby <rod@whitby.id.au>
Tue, 12 Dec 2006 20:00:09 +0000 (20:00 +0000)
committerRod Whitby <rod@whitby.id.au>
Tue, 12 Dec 2006 20:00:09 +0000 (20:00 +0000)
commitf1090c25b2daa51229f2222e2b92bc10bb45a5c6
treed6a1886701a230c91f7d4695d86731a8ecb3a091
parentdc2a64d0b899d47b494d5e58213e491ef2b4db06
parent9bd9a375ad327acbe3d013767b630b05393fab0f
Merge ... '26ab4051ec6ee9153656e1ea57a1ea5c53aad6ce'
     and '49c7fac357ce377fd6c3fd7142468078920e4984'
site/powerpc-linux