merge of '81d8dc81a1a7a826e84a23750afa2f81bb4c8787'
authorRichard Purdie <rpurdie@rpsys.net>
Thu, 28 Feb 2008 11:47:36 +0000 (11:47 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Thu, 28 Feb 2008 11:47:36 +0000 (11:47 +0000)
     and 'f3ce42d6e8e15e51ce97fef93a3948da8fedc3ad'


Trivial merge