diff -r fc0e1d002c9e -r da905fdd7f4a components/cppunit/cppunit.p5m
--- a/components/cppunit/cppunit.p5m	Tue Apr 05 05:41:03 2016 -0700
+++ b/components/cppunit/cppunit.p5m	Thu Apr 07 12:37:41 2016 -0700
@@ -17,7 +17,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -1370,9 +1370,6 @@
 file path=usr/share/cppunit/html/dir_7cb45018de5047743141146386c74b8d_dep.md5
 file path=usr/share/cppunit/html/dir_7cb45018de5047743141146386c74b8d_dep.png
 file path=usr/share/cppunit/html/dir_88e78ccf745e3838a93ba62b13d3a2f9.html
-file path=usr/share/cppunit/html/dir_88e78ccf745e3838a93ba62b13d3a2f9_dep.map
-file path=usr/share/cppunit/html/dir_88e78ccf745e3838a93ba62b13d3a2f9_dep.md5
-file path=usr/share/cppunit/html/dir_88e78ccf745e3838a93ba62b13d3a2f9_dep.png
 file path=usr/share/cppunit/html/dir_8b97d9feefc8df17c34e848e8f4d711e.html
 file path=usr/share/cppunit/html/dir_8b97d9feefc8df17c34e848e8f4d711e_dep.map
 file path=usr/share/cppunit/html/dir_8b97d9feefc8df17c34e848e8f4d711e_dep.md5
@@ -1409,6 +1406,7 @@
 file path=usr/share/cppunit/html/folderclosed.png
 file path=usr/share/cppunit/html/folderopen.png
 file path=usr/share/cppunit/html/functions.html
+file path=usr/share/cppunit/html/functions_0x7e.html
 file path=usr/share/cppunit/html/functions_a.html
 file path=usr/share/cppunit/html/functions_b.html
 file path=usr/share/cppunit/html/functions_c.html
@@ -1418,6 +1416,7 @@
 file path=usr/share/cppunit/html/functions_eval.html
 file path=usr/share/cppunit/html/functions_f.html
 file path=usr/share/cppunit/html/functions_func.html
+file path=usr/share/cppunit/html/functions_func_0x7e.html
 file path=usr/share/cppunit/html/functions_func_b.html
 file path=usr/share/cppunit/html/functions_func_c.html
 file path=usr/share/cppunit/html/functions_func_d.html
@@ -1438,7 +1437,6 @@
 file path=usr/share/cppunit/html/functions_func_u.html
 file path=usr/share/cppunit/html/functions_func_w.html
 file path=usr/share/cppunit/html/functions_func_x.html
-file path=usr/share/cppunit/html/functions_func_~.html
 file path=usr/share/cppunit/html/functions_g.html
 file path=usr/share/cppunit/html/functions_h.html
 file path=usr/share/cppunit/html/functions_i.html
@@ -1456,7 +1454,6 @@
 file path=usr/share/cppunit/html/functions_vars.html
 file path=usr/share/cppunit/html/functions_w.html
 file path=usr/share/cppunit/html/functions_x.html
-file path=usr/share/cppunit/html/functions_~.html
 file path=usr/share/cppunit/html/globals.html
 file path=usr/share/cppunit/html/globals_defs.html
 file path=usr/share/cppunit/html/globals_func.html