Continuing a merge...
fix warnings
Merge branch 'nokinds' of ssh://github.com/goldfirere/ghc into nokinds

Conflicts:
	libraries/containers
	libraries/time
	libraries/vector