83df7fa merge f17 for haskell-platform-2011.4

Merged and Committed by petersen 11 years ago
    merge f17 for haskell-platform-2011.4
    
        
file modified
+1 -0
file modified
+44 -25
file modified
+1 -1