merge of '27992ad903b456bde0a40788a183fd1b84d95beb'
authorRichard Purdie <rpurdie@rpsys.net>
Fri, 13 Oct 2006 12:50:54 +0000 (12:50 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Fri, 13 Oct 2006 12:50:54 +0000 (12:50 +0000)
     and '53955feff65d45d63101347b169233ef5920c1b5'


Trivial merge