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

[Toshio くらとみ]

commit 1e1d9107caf4afd7a0842aa2de824e0324c5eef8
Merge: deca5a3 62ea07e
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Oct 6 08:32:14 2011 -0700

    Merge branch 'master' into el6

 .gitignore         |    2 +
 python-fedora.spec |  147 ++++++++++++++++++----------------------------------
 sources            |    2 +-
 3 files changed, 54 insertions(+), 97 deletions(-)
---