merge of '4fa7627848aee19c170697491ca6e335fa384d4c'
authorRichard Purdie <rpurdie@rpsys.net>
Wed, 4 Apr 2007 23:08:15 +0000 (23:08 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Wed, 4 Apr 2007 23:08:15 +0000 (23:08 +0000)
     and 'e7b9bfc9b152c5457d9862001f03014f79bbfea1'


Trivial merge