Conflicts manually resolved this time:
	tiki-list_posts.php
	lib/wiki-plugins/wikiplugin_flash.php
	lib/wiki-plugins/wikiplugin_youtube.php
	lib/setup/prefs.php
	tiki-setup_base.php
	templates/tiki-list_posts.tpl
(white space characters count!)