Hook CryptContext class into the build.
Merge branch 'origin' of ../cvs/src