merge of '0392f48f534dce561d4b8cb01e8db5ad64500222'
authorRichard Purdie <rpurdie@rpsys.net>
Thu, 28 Feb 2008 12:41:00 +0000 (12:41 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Thu, 28 Feb 2008 12:41:00 +0000 (12:41 +0000)
     and 'a141267452dde7cd1e229a81095e09d64b4c3e9d'


Trivial merge