Merge.
authorRusty Russell <rusty@rustcorp.com.au>
Sat, 18 Jul 2009 05:57:40 +0000 (15:27 +0930)
committerRusty Russell <rusty@rustcorp.com.au>
Sat, 18 Jul 2009 05:57:40 +0000 (15:27 +0930)
commit3c81225fc0a4fb99d10282ebf11b7ec6ae1eabdd
tree49defe4609cde74d7701a4220fe8d94ebcdfbef8
parenta57ff6cbf6ab6209b201df20e1eecf96f40ae15d
parent33480b45899ab1095bf95717d26f86244ca6d8e9
Merge.