Merge branch 'master' into telegps-v0.3
authorKeith Packard <keithp@keithp.com>
Sat, 17 Aug 2013 15:33:31 +0000 (17:33 +0200)
committerKeith Packard <keithp@keithp.com>
Sat, 17 Aug 2013 15:33:31 +0000 (17:33 +0200)

Trivial merge