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)
commitb47e749d54a1239ad3c3d24a79f7443f01326a5b
tree3ab25f0568d17f16aacbeceeb904d8087675cd21
parent576d10a0f51634cf0c673db85b3b7293e45c32ef
parenta51e4211dfce493bee2d22e744a3dafcfeb8ffeb
Merge ... '77ff2b87c15014d305828d54bae10900dd0736a3'
     and 'd63f932f7e2b4d919e4f3007c767ecd149231528'