14fd98 Merge branch 'master' into rawhide/user/myoung/xendom0

Merged and Committed by Michael Young 14 years ago
    Merge branch 'master' into rawhide/user/myoung/xendom0
    
    Conflicts:
    	kernel.spec
    
        
file modified
+0 -1
file modified
+11 -4
file modified
+1 -2