Merge branch 'samba' of https://github.com/mtanski/fio

Signed-off-by: Jens Axboe <axboe@fb.com>

Conflicts:
	configure