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

[Toshio くらとみ]

commit e0bb3404b66550fdd4b9f074070eb5f11b113014
Merge: 9030a69 9e88d7e
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Tue Jul 26 16:17:01 2011 -0700

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore         |    3 +--
 python-fedora.spec |    9 ++++++++-
 sources            |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)
---