Merge branch 'dfsg-orig' into dfsg-debian

Conflicts:
	cleanup-script.sh
	tests/incremental.at

diff --cc cleanup-script.sh
index 39fd20beb1112cb87de9235d64b88648cc525827,684ac91414a1f273819612c8463876f4d1fde32f..1fd7d47b90cd3d6bff24d4285dcf9f9af25e2c14
--- 1/cleanup-script.sh
--- 2/cleanup-script.sh
+++ b/cleanup-script.sh
@@@ -217,4 -218,7 +218,10 @@@ then ${echo} 'x - removed lock director
  else ${echo} 'x - failed to remove lock directory `'${lock_dir}\''.'
    exit 1
  fi
++<<<<<<< HEAD:cleanup-script.sh
++=======
+ 
+ git add doc/Makefile doc/Makefile.in doc/README
+ 
++>>>>>>> c286dbf484dc985fb63d5c677fc8cd91b5b1d0f6:cleanup-script.sh
  exit 0

diff --cc src/create.c
Simple merge

diff --cc src/list.c
Simple merge

diff --cc tests/incremental.at
Simple merge