merge of '07a342693675fe2b1daacf0eb62302579d9fade3'
authorRichard Purdie <rpurdie@rpsys.net>
Fri, 16 May 2008 10:13:43 +0000 (10:13 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Fri, 16 May 2008 10:13:43 +0000 (10:13 +0000)
     and 'ea87a62ffb26f02649d7a8b5be07fcb5b84ba802'


Trivial merge