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

[Toshio くらとみ]

commit 31ffbda8cf129f5abe025f711273eba011d2d490
Merge: 9fd9fc2 16d7563
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Mon Feb 13 15:06:22 2012 -0800

    Merge branch 'master' into el5

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