Record merge with trunk, even if no changes

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs/naaya.content.bfile@21118 a0171fae-0946-0410-966d-b1775066cd26