[tomahawk/f16: 4/4] Merge remote-tracking branch 'origin/master' into f16

[Rex Dieter]

commit 218691168dba7a7ddd483c45469640b6163b2d10
Merge: 9165dbc 4c82d5c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 23 15:01:37 2012 -0500

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

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