[fio/f17: 7/7] Merge branch 'master' into f17

[Peter Robinson]

commit f4a3c29b75f668fd30909ddee76155f1318ce3c4
Merge: d8dfc0e 200b012
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Jan 9 17:22:32 2013 +0000

    Merge branch 'master' into f17

 .gitignore |    1 +
 fio.spec   |   18 +++++++++++++++---
 sources    |    2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)
---