merge
authorRusty Russell <rusty@rustcorp.com.au>
Fri, 15 Aug 2008 00:38:41 +0000 (10:38 +1000)
committerRusty Russell <rusty@rustcorp.com.au>
Fri, 15 Aug 2008 00:38:41 +0000 (10:38 +1000)
commit74e9da4d1c0b968fbac4b8da165e6ad5318329dd
tree6d7d193d4e27721fc22ba41dacd48d1e6c8df394
parent36e8b652d0aa045e6e427dc3851da24472ed6a95
parentfab2dc9383aefffce4005744722ecba4e60a45e4
merge