Update dependencies
Merge branch 'master' of http://darcs.haskell.org/git-mirrors/Cabal/
Merge branch 'master' into roles

Conflicts:
	Cabal/Cabal.cabal