merge of '3e5c07282be03225713ccfe986e33b85e156fe00'
authorRichard Purdie <rpurdie@rpsys.net>
Sat, 26 Aug 2006 17:44:42 +0000 (17:44 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sat, 26 Aug 2006 17:44:42 +0000 (17:44 +0000)
commit79fa061b76b9813588ce06d4b5cf64a70df29bce
tree1e420bec486f9c0cf55de4cdcc59fcb7ca92c775
parentcedf219f704f423b219b602de22b1ea7663df189
parentddd6d1fd26416a3766d754eeda4237a680a65520
Merge ... '3e5c07282be03225713ccfe986e33b85e156fe00'
     and '6a4cba9a5f2d744231cc63907df52f0615c8d744'