Commit 5ea6a8eaa2d449f4809623d8a70ffe59e7764ed8

Con Kolivas 2013-10-23T22:45:56

Merge branch 'master' into hashfast Conflicts: Makefile.am