Merge branch 'master' into gfio

Conflicts:
	engines/libaio.c
	engines/net.c
	iolog.h
	options.c
	options.h
	parse.c
	parse.h
	thread_options.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --cc HOWTO
Simple merge

diff --cc engines/libaio.c
Simple merge

diff --cc engines/net.c
Simple merge

diff --cc fio.1
Simple merge

diff --cc iolog.h
Simple merge

diff --cc options.c
Simple merge

diff --cc options.h
Simple merge

diff --cc parse.c
Simple merge

diff --cc thread_options.h
index a79494978e3be2c2e0f1ee2a59c0ae350e8e4894,d64423fe3a21f8817c9e42c09ef0675e732c3ac8..68056dfb3475f18a82b459576b44d95408882cc2
--- 1/thread_options.h
--- 2/thread_options.h
+++ b/thread_options.h
@@@ -123,8 -125,8 +123,9 @@@ struct thread_options 
        unsigned int fsync_on_close;
  
        unsigned int random_distribution;
 -      double zipf_theta;
 -      double pareto_h;
++
 +      fio_fp64_t zipf_theta;
 +      fio_fp64_t pareto_h;
  
        unsigned int random_generator;