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

[Rex Dieter]

commit 24ea0d88a3cf58ae4294643ae06d5fe4aebb50bd
Merge: 14221ce 7016e4a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Jun 20 15:59:44 2012 -0500

    Merge branch 'master' into f17

 tomahawk.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---