c95a56c Merge branch 'master' into f14

Merged and Committed by agoode 12 years ago
    Merge branch 'master' into f14
    
    Conflicts:
    	vips.spec
    
        
file modified
+1 -2
file modified
+1 -1
file modified
+45 -21