merge of '6c6d6fcd3941c653a9ea8f2a3ebf593147530821'
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 20 Nov 2006 14:35:15 +0000 (14:35 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Mon, 20 Nov 2006 14:35:15 +0000 (14:35 +0000)
     and 'af4fef7c47a7bd9d53b690340e39ebeaddaf676e'


Trivial merge