56fb46d Merge branch 'master' into f13

Merged and Committed by toshio 13 years ago
    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	python-setuptools.spec
    
        
file modified
+1 -1
file modified
+10 -1