Merge pull request #827 from jmaas/master

Remove another pre python 2.5 hack (md5 vs hashlib)