Merge branch 'master' of git://git.gag.com/fw/altos
authorMike Beattie <mike@ethernal.org>
Tue, 7 Aug 2012 18:46:56 +0000 (06:46 +1200)
committerMike Beattie <mike@ethernal.org>
Tue, 7 Aug 2012 18:46:56 +0000 (06:46 +1200)

Trivial merge