merge of '81780edffc3af0c4d12a2a9e46fc176ecf6d66c5'
authorRichard Purdie <rpurdie@rpsys.net>
Thu, 21 Feb 2008 11:33:05 +0000 (11:33 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Thu, 21 Feb 2008 11:33:05 +0000 (11:33 +0000)
     and 'b1eda41fd5a73d8e2f521e7ad1668a7736e90afd'


Trivial merge