[atf/f17: 6/6] Merge branch 'master' into f17

[Julio Merino]

commit 52f296e736c57bf191007e5ee89013e9a15234eb
Merge: fa4b142 6fbfbe3
Author: Julio Merino <jmmv at julipedia.org>
Date:   Mon Jun 18 20:21:17 2012 -0400

    Merge branch 'master' into f17
    
    Conflicts:
    	atf.spec

 README.Fedora |   22 ++++++++++++++++++++
 atf.spec      |   60 ++++++++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 71 insertions(+), 11 deletions(-)
---