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

[Toshio くらとみ]

commit 733c3c9ef9af92ca194f884e6d624b7c2974f609
Merge: 31ffbda 3bdf1ec
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Mar 8 13:48:04 2012 -0800

    Merge branch 'master' into el5

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