Merge branch 'master', remote-tracking branch 'origin' into new-typeable
dph-test: add -dep-suffix to Makefile, otherwise was not building deps"
Merge branch 'new-typeable' of http://darcs.haskell.org//packages/dph into new-typeable
Merge branch 'master', remote-tracking branch 'origin' into new-typeable