Merge branch 'hardlinks'

Conflicts:
	vmtouch.c