Updated for gcc 4.7
Merge branch 'master' of github.com:JohnReid/myrrh