09b3f8f merge f17 branch for update to ghc-7.0.4

Merged and Committed by petersen 11 years ago
    merge f17 branch for update to ghc-7.0.4
    
        
file modified
+3 -0
file modified
+64 -27
file modified
+1 -1