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

[Rex Dieter]

commit c14764a674c70059ad171660358895854bf87f4d
Merge: 417d053 ce1c2f6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 30 22:53:01 2012 -0500

    Merge branch 'master' into f16

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