merge
authorRusty Russell <rusty@rustcorp.com.au>
Thu, 14 Aug 2008 05:15:17 +0000 (15:15 +1000)
committerRusty Russell <rusty@rustcorp.com.au>
Thu, 14 Aug 2008 05:15:17 +0000 (15:15 +1000)

Trivial merge