merge
authorRusty Russell <rusty@rustcorp.com.au>
Mon, 4 Aug 2008 03:47:09 +0000 (13:47 +1000)
committerRusty Russell <rusty@rustcorp.com.au>
Mon, 4 Aug 2008 03:47:09 +0000 (13:47 +1000)

Trivial merge