11574d7 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
+2 -2
file modified
+5 -5
file modified
+72 -31
file modified
+6 -5
file modified
+1 -2
file removed
-185