Merge branch 'master' of http://darcs.haskell.org/ghc
authorDavid Waern <david.waern@gmail.com>
Mon, 13 Jun 2011 20:51:52 +0000 (20:51 +0000)
committerDavid Waern <david.waern@gmail.com>
Mon, 13 Jun 2011 20:51:52 +0000 (20:51 +0000)
commit45b83d8bd30f1520a0c32188775c205e3aed18ba
treed78f080f38f88dbf2731d58084e41a4e9d7ba67f
parentc217a75cf49d555228dfef43f4af0b8d23bd80e7
parentda15d0c556df3eacc6b37327ddffffea306b3760
Merge branch 'master' of darcs.haskell.org/ghc