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

[Toshio くらとみ]

commit 3a3ece4841ac880fcad827a3ca349701949314e6
Merge: 1304bfd 067bc7f
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Wed Aug 10 12:29:32 2011 -0700

    Merge branch 'master' into el6

 python-fedora.spec |   69 +++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 58 insertions(+), 11 deletions(-)
---