Merged from trunk.

diff --cc src/ACLASN.h
Simple merge

diff --cc src/asn.cc
Simple merge

diff --cc src/auth/basic/auth_basic.cc
Simple merge

diff --cc src/auth/basic/auth_basic.h
Simple merge

diff --cc src/auth/digest/auth_digest.cc
Simple merge

diff --cc src/auth/digest/auth_digest.h
Simple merge