35fc010 Merge branch 'f15' into f14

Merged and Committed by Jon Ciesla 13 years ago
    Merge branch 'f15' into f14
    
    Conflicts:
    	lilypond.spec
    
        
file modified
+5 -0
file modified
+27 -3
file modified
+1 -1