Merge branch 'cvsserver' of http://locke.catalyst.net.nz/git/git-martinlanghoff;...