Merge remote-tracking branch 'mjb/altosdroid'
authorKeith Packard <keithp@keithp.com>
Thu, 25 Oct 2012 07:09:01 +0000 (00:09 -0700)
committerKeith Packard <keithp@keithp.com>
Thu, 25 Oct 2012 07:09:01 +0000 (00:09 -0700)

Trivial merge