Conflicts:
	filefield_sources.api.php
	filefield_sources.info
	filefield_sources.module
	sources/attach.inc
	sources/clipboard.inc
	sources/imce.inc
	sources/reference.inc
	sources/remote.inc