Merge branch 'master' into aprs
authorKeith Packard <keithp@keithp.com>
Sat, 8 Dec 2012 01:34:10 +0000 (17:34 -0800)
committerKeith Packard <keithp@keithp.com>
Sat, 8 Dec 2012 01:34:10 +0000 (17:34 -0800)

Trivial merge