merge of '43c960d45911aef12f2312ce6684bc1c3678b4c1'
authorRichard Purdie <rpurdie@rpsys.net>
Thu, 6 Mar 2008 00:35:26 +0000 (00:35 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Thu, 6 Mar 2008 00:35:26 +0000 (00:35 +0000)
commit84aa765fd29ff318d2ad15538d35928573d46be6
tree030831706e667152eec0b9ae01aa7e6618168692
parent5530dca0be7f68ba3c716f9bd1a2f1867320ea74
parent32f4348497aef8995c7d7f4636b10d7c1c1f3392
Merge ... '43c960d45911aef12f2312ce6684bc1c3678b4c1'
     and 'fd24a981d47c073f1728f3aba7eaabcf9a2ac424'