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

[Toshio くらとみ]

commit 5500d12a59158b077c0e54ba34a9ae34fea40dcc
Merge: 0aa9d31 067bc7f
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Wed Aug 10 16:30:33 2011 -0700

    Merge branch 'master' into el5

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