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

[toshio]

commit 95c68d46a3d92d222d0f025d5c46ffc014fad15b
Merge: 733c3c9 44c1056
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Tue Apr 17 11:33:27 2012 -0700

    Merge branch 'master' into el5

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