a forgotten file
Merge branch 'unstable'

Conflicts:
	trunk/uninstall.php