Conflicts:
	configure-pre.in
	src/syncevo/Makefile.am

Version conflict in configure and unrelated changes near
same line in Makefile.