[kbruch/f16: 9/9] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit c820b0d31ecf4ddd4d18c2624ddabb405c23262c
Merge: eb7bc36 237aae1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:26:37 2012 -0600

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

 .gitignore  |    3 +--
 kbruch.spec |   29 +++++++++++++++++++++++++----
 sources     |    2 +-
 3 files changed, 27 insertions(+), 7 deletions(-)
---