674c68 Merge branch 'f12/master' into f12/user/myoung/xendom0

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