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)

Trivial merge