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

[Toshio くらとみ]

commit 1d41a8e70db87d9a7c7661dbe4723211669c380c
Merge: afaceac cc36712
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Jan 24 18:10:31 2013 -0800

    Merge branch 'master' into el6
    
    Conflicts:
    	python-fedora.spec

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