Merge remote-tracking branch 'mjb/altosdroid'
authorKeith Packard <keithp@keithp.com>
Tue, 23 Oct 2012 05:39:31 +0000 (22:39 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 23 Oct 2012 05:39:31 +0000 (22:39 -0700)

Trivial merge