sync with CVS
Merge commit 'daa11da480aa2966eed34fc527a0f99dfc1abd13' into sslmitm