merge
authorRusty Russell <rusty@rustcorp.com.au>
Tue, 5 Aug 2008 03:58:32 +0000 (13:58 +1000)
committerRusty Russell <rusty@rustcorp.com.au>
Tue, 5 Aug 2008 03:58:32 +0000 (13:58 +1000)
commitf6387bc4a0f5aa75160095a876b103758ea807c7
treee6164ed86abb3a298cec2653a5c0faeee8a81d8c
parent00ea3f8294da91eeea13f000ebb316f49610def4
parent999da3406c580e5b866e4fc0ac5a91bf5696dfb9
merge