merge of '6b3553faa17c40c389a2d9c4279cd0a6417358e7'
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 18 Feb 2008 23:17:33 +0000 (23:17 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Mon, 18 Feb 2008 23:17:33 +0000 (23:17 +0000)
     and 'faf56bcfb610eaf73ff3c77e1c8c451cde82165d'


Trivial merge