Update dependencies
Merge branch 'master' of http://darcs.haskell.org/git-mirrors/Cabal/
Added a new extension (RoleAnnotations) to the list
Fix link to users' guide.
Merge branch 'master' into roles

Conflicts:
	Cabal/Cabal.cabal
Add sysconfdir.
Some cleanups
Typo.
finalizePackageDescription: don't reverse the order of components.

Fixes #1424.
Rename 'extra-html-files' to 'extra-doc-files'.
Merge pull request #1427 from 23Skidoo/extra-haddock-files

Rename 'extra-html-files' to 'extra-doc-files'.
Merge pull request #1425 from 23Skidoo/issue-1424

Change the component load order for repl.
Merge remote-tracking branch 'upstream/master'
Use proper punctuation consistently.
Rename 'Distribution.Compat.*' to 'Distribution.Client.Compat.*'.

Helps to disambiguate Cabal's compat modules from cabal-install's.
80-col violations.
Normalise the names of environment variables on Windows.

Thanks to Eugene Sukhodolin for the bug report.
Merge 'D.Compat.Exception' and 'D.Client.Compat.Exception'.
80-col violation.
Whitespace.