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

[Rex Dieter]

commit 6ffed2b741ffafc6d9da7afb0d5ee0ebf773ab34
Merge: 2186911 7016e4a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Jun 20 16:00:16 2012 -0500

    Merge branch 'master' into f16

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