Merge branch 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/etc/profile
drwxr-xr-x - bg
drwxr-xr-x - bin
drwxr-xr-x - dot
drwxr-xr-x - el
drwxr-xr-x - git
-rw-r--r-- 501 mdw.conf
-rwxr-xr-x 6945 setup