merge of '0aec671c9ce897a91bee8ce4cd1731b505b08c94'
authorRichard Purdie <rpurdie@rpsys.net>
Fri, 28 Dec 2007 16:30:46 +0000 (16:30 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Fri, 28 Dec 2007 16:30:46 +0000 (16:30 +0000)
     and 'efc89b66950503726077461acaa664f7705ed559'


Trivial merge