Make Python treat the merger directory as a package containing other packages
Removed TABs
Removed TABs
Removed TABs
Merged in updates from master
Merge branch 'master' into devel
Revert "Removed TABs"

This reverts commit d0f2ed9f40ce97a24690d889a571a78f1de00013.
Revert "Removed TABs"

This reverts commit ad290a02e15ee7c944476313dfbf5b68efe17d8c.

Conflicts:

	cmsActualMergingFiles.py
Revert "Removed TABs"

This reverts commit 888c92fef22d1d91116430c0aa3e132753e52409.
Merge branch 'master' into devel

Conflicts:
	cmsActualMergingFiles.py