Merge branch 'ronnie'
authorRusty Russell <rusty@rustcorp.com.au>
Wed, 10 Nov 2010 05:17:12 +0000 (15:47 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Wed, 10 Nov 2010 05:17:12 +0000 (15:47 +1030)

Trivial merge