Merge branch 'master' of /afs/hcoop.net/user/h/hc/hcoop/.hcoop-git/domtool2