Merge branch 'master' into droid-gps
authorKeith Packard <keithp@keithp.com>
Tue, 16 Apr 2013 06:26:33 +0000 (23:26 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 16 Apr 2013 06:26:33 +0000 (23:26 -0700)

Trivial merge