merge of '47d9bffa351513f062299f9ac77e39b7bfe6d74f'
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 27 Aug 2006 17:34:53 +0000 (17:34 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sun, 27 Aug 2006 17:34:53 +0000 (17:34 +0000)
     and 'b4baa952a21796f3da8adaf6acd8c844668a33d8'


Trivial merge