igonre this commit
Merge branch 'permacoin' of github.com:alexwzk/bitcoin into permacoin

Conflicts:
	Makefile
	src/Makefile