Merge branch 'master' of /home/simonmar/ghc-git
authorSimon Marlow <marlowsd@gmail.com>
Tue, 5 Apr 2011 15:03:25 +0000 (16:03 +0100)
committerSimon Marlow <marlowsd@gmail.com>
Tue, 5 Apr 2011 15:03:25 +0000 (16:03 +0100)
commit60ec8693a9c9cf34fda6a097286dab3fe6bddd70
tree3849a0e4ece51decc9996476e26a56eb24c58441
parent40589658a18f116acea1664b1e75eb74385a2e87
parenta28ed19690f2de7eb979d1d75f35071abbf9a102
Merge branch 'master' of /home/simonmar/ghc-git