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

[Julio Merino]

commit 8f5e98a01ab6a07e3229b2600aecdd08ae3ccfbb
Merge: 52f296e b281150
Author: Julio Merino <julio at meroh.net>
Date:   Tue Jul 10 18:07:56 2012 -0400

    Merge branch 'master' into f17

 .gitignore |    1 +
 atf.spec   |   10 ++++++----
 sources    |    2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)
---