sync with osgeolive svn