Merge.
authorRusty Russell <rusty@rustcorp.com.au>
Sat, 18 Jul 2009 05:57:40 +0000 (15:27 +0930)
committerRusty Russell <rusty@rustcorp.com.au>
Sat, 18 Jul 2009 05:57:40 +0000 (15:27 +0930)

Trivial merge