merge of '2c34202b0dfd11794a79da2cd891a88adbfcea48'
authorRichard Purdie <rpurdie@rpsys.net>
Thu, 28 Feb 2008 12:09:46 +0000 (12:09 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Thu, 28 Feb 2008 12:09:46 +0000 (12:09 +0000)
     and 'fd02aa1602a7d21248a66f67a25e6435c8443a48'


Trivial merge