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

[Toshio くらとみ]

commit 0c211de6dc08e7f28eafbc34b0c90cbb5cd51c54
Merge: 1e1d910 16d7563
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Mon Feb 13 15:07:01 2012 -0800

    Merge branch 'master' into el6

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