[tomahawk/f17: 3/3] Merge remote-tracking branch 'origin/master' into f17

[Rex Dieter]

commit 14221ce098bb7df7d93548e6ef7ea102de7ee8d8
Merge: 3e9751c 4c82d5c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 23 14:59:03 2012 -0500

    Merge remote-tracking branch 'origin/master' into f17
    
    Conflicts:
    	.gitignore
    	sources
    	tomahawk.spec

 .gitignore    |    3 +--
 sources       |    2 +-
 tomahawk.spec |   11 ++++++++---
 3 files changed, 10 insertions(+), 6 deletions(-)
---