CVS: cvs.openbsd.org: src

[Ted Unangst]

CVSROOT:        /cvs
Module name:    src
Changes by:     t...@cvs.openbsd.org    2014/03/23 18:00:29

Modified files:
        lib/libc/crypt : bcrypt.c 

Log message:
oops, merge error