merge of '83d79b5cd4fd20054c665e25366f4ee45f3b681f'
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 21 Nov 2006 10:47:09 +0000 (10:47 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Tue, 21 Nov 2006 10:47:09 +0000 (10:47 +0000)
     and 'df3150bb10ef98bd118330fe8a496b4c29f4a861'


Trivial merge