modified tofu using D-H
Merge branch 'master' of git://github.com/ajwerner/safe