Merge branch 'master' into droid-gps
authorKeith Packard <keithp@keithp.com>
Mon, 15 Apr 2013 03:02:10 +0000 (20:02 -0700)
committerKeith Packard <keithp@keithp.com>
Mon, 15 Apr 2013 03:02:10 +0000 (20:02 -0700)

Trivial merge