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

[Toshio くらとみ]

commit 92d891295c8d2ef5811c7c795cb6656885eb2e22
Merge: 0c73705 b5c12dd
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Jan 10 13:19:52 2013 -0800

    Merge branch 'master' into el6

 .gitignore         |    1 +
 python-fedora.spec |   32 +++++++++++++++++++++++++++++---
 sources            |    2 +-
 3 files changed, 31 insertions(+), 4 deletions(-)
---