merge of 'a8fc829ccd7c5a7c71d76bac5c9f37e82d0b2ab5'
authorRichard Purdie <rpurdie@rpsys.net>
Sat, 1 Sep 2007 18:44:16 +0000 (18:44 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sat, 1 Sep 2007 18:44:16 +0000 (18:44 +0000)
     and 'ed77cd74b64e0454761e99d7c3b09c39ef2a97a9'


Trivial merge