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)

Trivial merge