merge of '627ef0e237fba1cc0278e8fcc2c337e80dfef06c'
authorRichard Purdie <rpurdie@rpsys.net>
Tue, 4 Mar 2008 15:21:42 +0000 (15:21 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Tue, 4 Mar 2008 15:21:42 +0000 (15:21 +0000)
     and 'cf1e2bc5ee87871b3d33f7110d0d3803528b6d77'


Trivial merge