Commit aca34d0aa166a89760b919cdcc32c3554267ff91

Con Kolivas 2012-07-24T20:28:52

Merge branch 'master' into newscrypt