Merge remote-tracking branch 'mjb/altosdroid'
authorKeith Packard <keithp@keithp.com>
Fri, 26 Oct 2012 21:08:32 +0000 (14:08 -0700)
committerKeith Packard <keithp@keithp.com>
Fri, 26 Oct 2012 21:08:32 +0000 (14:08 -0700)

Trivial merge