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

Trivial merge