Merge branch 'tdb2'
authorRusty Russell <rusty@rustcorp.com.au>
Wed, 1 Dec 2010 13:24:33 +0000 (23:54 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Wed, 1 Dec 2010 13:24:33 +0000 (23:54 +1030)

Trivial merge