K 10 svn:author V 5 peter K 8 svn:date V 27 2008-12-21T04:27:52.488913Z K 7 svn:log V 116 Merge rev 185725 (184996 in head): Use correct names in END() macros. Approved by: re (kib) Reminded by: kensmith END