67cb2a5 Merge branch 'f16'

Merged and Committed by ajax 12 years ago
    Merge branch 'f16'
    
    Conflicts:
    	plymouth.spec
    	sources
    
        
file modified
+2 -2
file modified
+13 -4
file modified
+1 -1