This commit was manufactured by cvs2svn to create tag 'merged-from-1_0'.
git-svn-id: file:///home/survex-svn/survex/tags/merged-from-1_0@2218 4b37db11-9a0c-4f06-9ece-9ab7cdaee568