646207f Merge branch 'bz664206' into f14

Merged and Committed by Kyle McMartin 13 years ago
    Merge branch 'bz664206' into f14
    
    Conflicts:
    	kernel.spec
    
        
file modified
+9 -2