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)
commit339144112d488d42d84fe5e1d91ba20bde769f76
tree7875c8c21e291d8d1bb96b50394480ef6f1f2c10
parent69c3a4e292aabe37e7ae28bb521462a1619a3fa2
parentd9ce834542de0a4225a52b3c129082468d3cfa79
Merge ... '6d9979f4d29d1dff2350a558f25813ce7f2c8c9e'
     and '9d51ade6b4318612931d9e49436a802f6c1fa43f'