merge of '32fb34a3d6b83b091f671bba6f6fb90146a59544'
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 5 Nov 2007 20:06:00 +0000 (20:06 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Mon, 5 Nov 2007 20:06:00 +0000 (20:06 +0000)
     and 'aa0124fac8e1daf7beff69f5b6b4921d8ffcf7b3'


Trivial merge