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