Merge branch 'master' of http://darcs.haskell.org/ghc
authorDavid Terei <davidterei@gmail.com>
Sun, 11 Dec 2011 20:04:19 +0000 (12:04 -0800)
committerDavid Terei <davidterei@gmail.com>
Sun, 11 Dec 2011 20:04:19 +0000 (12:04 -0800)
commitedc4543be34c365b43e96a46a37e6417aeae25a2
tree7e5d2f3d0c56640152dde3072a4e081925fca303
parent72bfc815461354e806e5ef4a0a36db480aada28d
parent4bc413de1dbe7ca6d3d521ab9044d9c1cbf6fd5b
Merge branch 'master' of darcs.haskell.org/ghc