Merge branch 'master' into droid-gps
authorKeith Packard <keithp@keithp.com>
Sat, 13 Apr 2013 17:51:04 +0000 (10:51 -0700)
committerKeith Packard <keithp@keithp.com>
Sat, 13 Apr 2013 17:51:04 +0000 (10:51 -0700)

Trivial merge