Merge branch 'gssweb-apache' of moonshot.suchdamage.org:/srv/git/mod_auth_kerb into...