Conflicts:
	htdocs/artefact/file/blocktype/filedownload/theme/raw/filedownload.tpl

This merge had a conflict with some theme changes by evonne disagreeing
with what I had changed, removing WWWROOT from the file download
template.  All leap2 related stuff merged clean