[python-setuptools/f13/master: 13/13] Merge branch 'master' into f13

[Toshio くらとみ]

commit 56fb46dd9430da0a672116e069070ac2040503f0
Merge: b7fe196 957130b
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Tue Aug 10 15:02:02 2010 -0400

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	python-setuptools.spec

 .gitignore             |    2 +-
 python-setuptools.spec |   11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)
---