merge of '80401af978389dc31680f5749d9a6b066bbee542'
authorRichard Purdie <rpurdie@rpsys.net>
Sat, 1 Dec 2007 22:36:52 +0000 (22:36 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sat, 1 Dec 2007 22:36:52 +0000 (22:36 +0000)
     and 'eb184b297334b4fd07df0787e5149d8be2c97b65'


Trivial merge