sync with vufind SVN trunk