Merged from trunk

diff --cc configure.in
Simple merge

diff --cc libntlmauth/ntlmauth.cc
Simple merge

diff --cc libntlmauth/ntlmauth.h
Simple merge

diff --cc libntlmauth/support_bits.cci
Simple merge

diff --cc src/cf.data.pre
Simple merge

diff --cc src/client_side.cc
Simple merge

diff --cc src/htcp.cc
Simple merge

diff --cc src/icp_v2.cc
Simple merge

diff --cc src/structs.h
Simple merge