Merge branch 'master' into altosdroid
authorMike Beattie <mike@ethernal.org>
Sun, 10 Mar 2013 07:24:56 +0000 (20:24 +1300)
committerMike Beattie <mike@ethernal.org>
Sun, 10 Mar 2013 07:24:56 +0000 (20:24 +1300)

Trivial merge