Merge branch 'master' of ozlabs.org:ccan
authorRusty Russell <rusty@rustcorp.com.au>
Fri, 8 Jun 2012 10:58:01 +0000 (20:28 +0930)
committerRusty Russell <rusty@rustcorp.com.au>
Fri, 8 Jun 2012 10:58:01 +0000 (20:28 +0930)

Trivial merge