Merge branch 'master' of git.carlh.net:git/cdist
-rwxr-xr-x 30889 cdist
-rwxr-xr-x 975 vmbuild