a2b1c73 Merge branch 'f16'

Merged and Committed by cheeselee 12 years ago
    Merge branch 'f16'
    
    Conflicts:
    	Zim.spec
    
        
file modified
+1 -0
file modified
+5 -5
file modified
+1 -1
file removed
-19