Only file conflict is the xfconf xml defaults file,
but that is unavoidable for now.


(Old svn revision: 30222)