merge of '6b50eeffe6b0887666782f657e8f8fc694b7045c'
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 20 Nov 2006 14:33:19 +0000 (14:33 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Mon, 20 Nov 2006 14:33:19 +0000 (14:33 +0000)
     and 'c647d36367af59b2cc5bdd6d28a4c0a873539f76'


Trivial merge