merge of '05ddfe24471c42c447a6996f4ee8a09bbd402e23'
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 22 Jan 2008 09:15:26 +0000 (09:15 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Tue, 22 Jan 2008 09:15:26 +0000 (09:15 +0000)
     and 'ee28a8fbd4b4c0cc97fe47467c837fb525ecdf82'


Trivial merge