merge of '501c67dde049332cb9a85285814cba121334c407'
authorRichard Purdie <rpurdie@rpsys.net>
Thu, 21 Feb 2008 13:23:49 +0000 (13:23 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Thu, 21 Feb 2008 13:23:49 +0000 (13:23 +0000)
     and 'bf20fc7ee1fe9571699c9a63554b0f0ebb898921'


Trivial merge