524f2bf Merge commit '70db78cf257fd711383653404c29ef76ad11ca4b' into f13

Merged and Committed by salimma 13 years ago
    Merge commit '70db78cf257fd711383653404c29ef76ad11ca4b' into f13
    
    Conflicts:
    	zeroinstall-injector.spec
    
        
file modified
+4 -1