K 10 svn:author V 7 rwatson K 8 svn:date V 27 2011-11-28T14:39:56.467278Z K 7 svn:log V 152 Merge r228040 from head to stable/9: Cross-reference capsicum.4 from cap_enter.2 and cap_new.2. Sponsored by: Google, Inc. Approved by: re (kib) END