merge of '6d9979f4d29d1dff2350a558f25813ce7f2c8c9e'
authorRichard Purdie <rpurdie@rpsys.net>
Fri, 29 Feb 2008 16:13:29 +0000 (16:13 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Fri, 29 Feb 2008 16:13:29 +0000 (16:13 +0000)
     and '9d51ade6b4318612931d9e49436a802f6c1fa43f'


Trivial merge