Merge branch 'io'
authorRusty Russell <rusty@rustcorp.com.au>
Mon, 14 Oct 2013 11:03:51 +0000 (21:33 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Mon, 14 Oct 2013 11:03:51 +0000 (21:33 +1030)

Trivial merge