merge of '20512a86807847c46b89aa3589332b9d24cd6502'
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 20 Nov 2006 14:34:03 +0000 (14:34 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Mon, 20 Nov 2006 14:34:03 +0000 (14:34 +0000)
     and 'd6303c5e818fd02ef51ffd8057190cb2a110bc74'


Trivial merge