[cantor/f16: 2/2] Merge branch 'f17' into f16

[Rex Dieter]

commit f1fcbfb3155bc0c878195c04bc3c468de6a60325
Merge: 01c01c7 5dc88fe
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 3 06:54:55 2012 -0500

    Merge branch 'f17' into f16

 .gitignore  |    1 +
 cantor.spec |    5 ++++-
 sources     |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---