Create a development branch for the hash library.
Merge from trunk.
Merge with the offending files removed.
Another merge.
Merge from trunk.