Merge branch 'master' of ssh://router/data/git/fio
authorJens Axboe <jaxboe@fusionio.com>
Fri, 25 Jun 2010 12:34:08 +0000 (14:34 +0200)
committerJens Axboe <jaxboe@fusionio.com>
Fri, 25 Jun 2010 12:34:08 +0000 (14:34 +0200)

Trivial merge