Merge remote-tracking branch 'mjb/altosdroid'
authorKeith Packard <keithp@keithp.com>
Sun, 10 Mar 2013 18:43:06 +0000 (11:43 -0700)
committerKeith Packard <keithp@keithp.com>
Sun, 10 Mar 2013 18:43:06 +0000 (11:43 -0700)

Trivial merge