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)
commit282f0451dd141db3304ab73e4020a849e59721eb
tree53251ad243a73d799b64a4b55d8ac4d6797add90
parent0680d62d57496cea7ae4f1ef317c46e689b28e21
parent78e1de481bfdbf7c7bb908c317b23c8ee275c84f
Merge remote-tracking branch 'mjb/altosdroid'