merge of '84534f67cba0a9730d36b935b879e535f187b38d'
authorRichard Purdie <rpurdie@rpsys.net>
Sat, 15 Mar 2008 19:15:45 +0000 (19:15 +0000)
committerRichard Purdie <rpurdie@rpsys.net>
Sat, 15 Mar 2008 19:15:45 +0000 (19:15 +0000)
commit0b64e8f057ae4e121e68b52c1a4c2d8cd77884d8
treef8670e64ab562ec6af0d6eddcc91149f2a752137
parent632f52e42eaa4e207e069e5ed6b9f0019f1516a0
parent19f83be5af44a1c58d86f4ee122cdf1e58a3f622
Merge ... '84534f67cba0a9730d36b935b879e535f187b38d'
     and 'ceb8dd6449d4803228f8cbdf49c91c7c26fb5760'