Merge remote-tracking branch 'mjb/altosdroid'
authorKeith Packard <keithp@keithp.com>
Thu, 20 Sep 2012 09:30:19 +0000 (11:30 +0200)
committerKeith Packard <keithp@keithp.com>
Thu, 20 Sep 2012 09:30:19 +0000 (11:30 +0200)

Trivial merge