Merge branch 'master' of github.com:heimdal/heimdal

Conflicts:
	lib/gssapi/gssapi/gssapi.h
	lib/gssapi/gssapi_mech.h
	lib/gssapi/mech/gss_mech_switch.c

autogen.sh

@@ -2,4 +2,5 @@
 # to really generate all files you need to run "make distcheck" in a
 # object tree, but this will do if you have all parts of the required
 # tool-chain installed
-autoreconf -f -i || { echo "autoreconf failed: $?"; exit 1; }
+PATH=/usr/local/bin:$PATH
+/usr/local/bin/autoreconf -f -i || { echo "autoreconf failed: $?"; exit 1; }