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

[toshio]

commit 333968e46a6859f394e48dad8b16e69d3f9c192c
Merge: baeac24 44c1056
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Tue Apr 17 11:29:07 2012 -0700

    Merge branch 'master' into f16

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