Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.Approved by: re (implicit)Sponsored by: The FreeBSD Foundation
Resolve conflicts.
Resolve conflicts
Merge
Config information for FreeBSD
This commit was generated by cvs2svn to compensate for changes in r22347,which included commits to RCS files with non-trunk default branches.
Initial import of OPIE v2.3 from ftp://ftp.nrl.navy.mil/pub/security/opie/