Merge branch 'tojunio' of http://locke.catalyst.net.nz/git/git-martinlanghoff into...