4163d84 Merge branch 'master' into f19

Merged and Committed by ahs3 10 years ago
    Merge branch 'master' into f19
    
    Conflicts:
    	acpica-tools.spec
    
        
file modified
+4 -0
file modified
+28 -28
file modified
+15 -2
file modified
+3 -3
file modified
+7 -1
file modified
+2 -2