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

[Toshio くらとみ]

commit 9fd9fc278ad181648431c385214aa1a8906f88cf
Merge: 5500d12 62ea07e
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Oct 6 08:31:46 2011 -0700

    Merge branch 'master' into el5

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