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

[Toshio くらとみ]

commit 7599b6e09cf804201289ca21f990e0b087d13a37
Merge: 0c211de 3bdf1ec
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Mar 8 13:47:36 2012 -0800

    Merge branch 'master' into el6

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