merge of '3c603fa45cf43613ab6041072798d5fbe162e6f3'
authorRichard Purdie <rpurdie@rpsys.net>
Thu, 2 Nov 2006 00:00:40 +0000 (00:00 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Thu, 2 Nov 2006 00:00:40 +0000 (00:00 +0000)
     and 'b125865ca3f9be3fcd9bd2cf94915c3b0ac3f070'


Trivial merge