Merge branch 'rfc822'
authorRusty Russell <rusty@rustcorp.com.au>
Thu, 3 Jan 2013 01:06:59 +0000 (11:36 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Thu, 3 Jan 2013 01:06:59 +0000 (11:36 +1030)

Trivial merge