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

[toshio]

commit a96ed05080864a59c95b0ed985c04c10ee2b17ad
Merge: 7599b6e 44c1056
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Tue Apr 17 11:33:09 2012 -0700

    Merge branch 'master' into el6

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