Move to cms-sw/root@7a6632417af1a2f8d7

This is v6-00-01 + Bill's patch.