[cantor/f16: 12/12] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit c1b8be19b4a3aad20fd5168b9a28a9e0786f8f1a
Merge: be36176 e9a544e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:19:04 2012 -0600

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

 .gitignore  |    1 +
 cantor.spec |   40 ++++++++++++++++++++++++++++++++++------
 sources     |    2 +-
 3 files changed, 36 insertions(+), 7 deletions(-)
---