Merge branch 'master' into telegps-v0.3
authorKeith Packard <keithp@keithp.com>
Mon, 26 Aug 2013 05:00:27 +0000 (22:00 -0700)
committerKeith Packard <keithp@keithp.com>
Mon, 26 Aug 2013 05:00:27 +0000 (22:00 -0700)

Trivial merge