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

[Rex Dieter]

commit 417d053d4bb8843919769e481d1ba4af7b66b367
Merge: c1b8be1 16f7c53
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 13:54:10 2012 -0500

    Merge branch 'master' into f16

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