merge of '091a7ba3a2af9d82db7d91f98962b340d3dc64d2'
authorRichard Purdie <rpurdie@rpsys.net>
Sat, 26 Aug 2006 21:30:30 +0000 (21:30 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sat, 26 Aug 2006 21:30:30 +0000 (21:30 +0000)
     and 'c8c8e34a5827662a4d603c1978a1d2719cda9679'


Trivial merge