merge of '90a1ac7c53dbaf35a4b93a66275d608d001eb092'
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 27 Aug 2006 17:37:21 +0000 (17:37 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sun, 27 Aug 2006 17:37:21 +0000 (17:37 +0000)
commite75954d06cc21565451c14de8f3d3c31d7d0293a
treee7553f3445587659838abf1a7fa06473cc838d8c
parentea43a6c869027d4d3b45999fa4d95d2be78e00d6
parent2101f6f377a76c373b5ef4ff2fb8484ab5d4d31f
Merge ... '90a1ac7c53dbaf35a4b93a66275d608d001eb092'
     and 'ec80efa0b796cacd58e78cc5eeb3e250413712e8'