b5a747e Merge branch 'master' into f18

Merged and Committed by Rex Dieter 10 years ago
    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	alpine.spec
    	sources
    
        
file modified
+1 -1
file added
+30
file modified
+31 -13
file modified
+1 -2