merge
authorRusty Russell <rusty@rustcorp.com.au>
Sun, 31 May 2009 03:08:03 +0000 (12:38 +0930)
committerRusty Russell <rusty@rustcorp.com.au>
Sun, 31 May 2009 03:08:03 +0000 (12:38 +0930)

Trivial merge