sync with cvs
Merge commit '1d58ff9' into sslmitm