merge of '68653f0e949fe7055f2dc011744ee97ae437d2e8'
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 12 Aug 2007 12:21:37 +0000 (12:21 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sun, 12 Aug 2007 12:21:37 +0000 (12:21 +0000)
commit26377a66e39764290af4b8a049a5663afcc2377e
treec51954358841bea2d4b8ac2843f4ba496becb034
parente5f489c3abc2aece8badb789b0a47bf118134a06
parente5b00f19482f207b168e8495a26270f6ce3406ab
Merge ... '68653f0e949fe7055f2dc011744ee97ae437d2e8'
     and 'b3274bff48897f5f043f1256c823866ff6981f15'