Merge branch 'master' of /Users/benl/devel/ghc/ghc-head
authorBen Lippmeier <benl@ouroborus.net>
Fri, 15 Apr 2011 05:24:42 +0000 (15:24 +1000)
committerBen Lippmeier <benl@ouroborus.net>
Fri, 15 Apr 2011 05:24:42 +0000 (15:24 +1000)
commitd08789a5f1aa92d3fc45239a842e0d0701e0ac2c
tree84a323fd584865249582d7cfdbebcc9f248d5145
parent9b4854f54345a93b0801a0d17eaa1cbaae9b5e5c
parent25297a13bd6be722a74ee87237498a5626b298ef
Merge branch 'master' of /Users/benl/devel/ghc/ghc-head