Merge branch 'master' of ssh://mjb@git.ethernal.org/~/git/altos
authorMike Beattie <mike@ethernal.org>
Thu, 2 Aug 2012 09:18:15 +0000 (21:18 +1200)
committerMike Beattie <mike@ethernal.org>
Thu, 2 Aug 2012 09:18:15 +0000 (21:18 +1200)

Trivial merge