Merge remote-tracking branch 'mjb/master'
authorKeith Packard <keithp@keithp.com>
Wed, 29 Aug 2012 18:29:24 +0000 (11:29 -0700)
committerKeith Packard <keithp@keithp.com>
Wed, 29 Aug 2012 18:29:24 +0000 (11:29 -0700)
commit583458772746317b98fced907ec780edff465888
tree8ba200b22edf19d554fe896eeea894f916cef87c
parentaea10c107dff2643677a9c8d1fc41e14f4a66049
parent17b6ffb6c090112367eac944494f0fa58da453c7
Merge remote-tracking branch 'mjb/master'

Pull in Mike's fancy new AltosDroid bits