Merge branch 'ccantool'
authorRusty Russell <rusty@rustcorp.com.au>
Mon, 19 Mar 2012 05:51:00 +0000 (16:21 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Mon, 19 Mar 2012 05:51:00 +0000 (16:21 +1030)

Trivial merge