Merge remote-tracking branch 'mjb/altosdroid'
authorKeith Packard <keithp@keithp.com>
Thu, 7 Mar 2013 21:00:44 +0000 (13:00 -0800)
committerKeith Packard <keithp@keithp.com>
Thu, 7 Mar 2013 21:00:44 +0000 (13:00 -0800)

Trivial merge