Merge branch 'altosdroid'
authorMike Beattie <mike@ethernal.org>
Sun, 21 Apr 2013 02:51:07 +0000 (14:51 +1200)
committerMike Beattie <mike@ethernal.org>
Sun, 21 Apr 2013 02:51:07 +0000 (14:51 +1200)

Trivial merge