Merge branch 'judy'
authorRusty Russell <rusty@rustcorp.com.au>
Sat, 30 Oct 2010 10:15:59 +0000 (20:45 +1030)
committerRusty Russell <rusty@rustcorp.com.au>
Sat, 30 Oct 2010 10:15:59 +0000 (20:45 +1030)

Trivial merge