merge of '90a1ac7c53dbaf35a4b93a66275d608d001eb092'
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 27 Aug 2006 17:37:21 +0000 (17:37 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sun, 27 Aug 2006 17:37:21 +0000 (17:37 +0000)
     and 'ec80efa0b796cacd58e78cc5eeb3e250413712e8'


Trivial merge