2022e0a Merge branch 'f12/master' into f12/user/myoung/xendom0

Merged and Committed by myoung 13 years ago
    Merge branch 'f12/master' into f12/user/myoung/xendom0
    
    Conflicts:
    	kernel.spec
    
        
file modified
+61 -1