merge of '7c5dba6a4cc7c7a653ff9454f9d2787304cdc736'
authorRichard Purdie <rpurdie@rpsys.net>
Wed, 15 Nov 2006 10:44:22 +0000 (10:44 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Wed, 15 Nov 2006 10:44:22 +0000 (10:44 +0000)
     and 'a92b3f38a2b90eca4b4e230c498fbe32f7013525'


Trivial merge