1
Merge branch 'master' of https://github.com/r2007/elfhack

Conflicts:
	elfhack/elffile.py