merge of '77ff2b87c15014d305828d54bae10900dd0736a3'
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 3 Dec 2006 21:39:35 +0000 (21:39 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sun, 3 Dec 2006 21:39:35 +0000 (21:39 +0000)
     and 'd63f932f7e2b4d919e4f3007c767ecd149231528'


Trivial merge