Crude isomorphism matcher - tuples based.
Merge branch 'master' of github.com:afs/AFS-Dev