[python-fedora/f16: 2/2] Merge branch 'master' into f16

[toshio]

commit da7ec9cf94c4466edf5855f9b4723a16aee5ca6e
Merge: 333968e 6a71f49
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Tue Apr 17 12:27:23 2012 -0700

    Merge branch 'master' into f16

 .gitignore         |    1 +
 python-fedora.spec |    6 +++++-
 sources            |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---