merge of '416609d94012a3c6bcceb5665830fd720e6cbc0c'
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 28 Jan 2008 21:04:43 +0000 (21:04 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Mon, 28 Jan 2008 21:04:43 +0000 (21:04 +0000)
     and '88b6d0d5b0e5836a9bbf16311ac747bf25d751d6'


Trivial merge