Merge branch 'master' into gfio

diff --cc HOWTO
Simple merge

diff --cc backend.c
Simple merge

diff --cc client.c
Simple merge

diff --cc engines/net.c
Simple merge

diff --cc fio.1
Simple merge

diff --cc io_u.c
Simple merge

diff --cc options.c
Simple merge

diff --cc os/os.h
Simple merge

diff --cc stat.c
Simple merge