merge
authorRusty Russell <rusty@rustcorp.com.au>
Mon, 18 Aug 2008 04:12:27 +0000 (14:12 +1000)
committerRusty Russell <rusty@rustcorp.com.au>
Mon, 18 Aug 2008 04:12:27 +0000 (14:12 +1000)

Trivial merge