Merge branch 'master' of ssh://router/data/git/fio

Conflicts:

	fio.h