Merge the Disobedience rewrite.

author Richard Kettlewell <rjk@greenend.org.uk>

Sun, 15 Jun 2008 17:25:23 +0000 (18:25 +0100)

committer Richard Kettlewell <rjk@greenend.org.uk>

Sun, 15 Jun 2008 17:25:23 +0000 (18:25 +0100)
author Richard Kettlewell <rjk@greenend.org.uk>
Sun, 15 Jun 2008 17:25:23 +0000 (18:25 +0100)
committer Richard Kettlewell <rjk@greenend.org.uk>
Sun, 15 Jun 2008 17:25:23 +0000 (18:25 +0100)
diff --cc configure.ac
Simple merge
diff --cc lib/trackdb.c
Simple merge
author	Richard Kettlewell <rjk@greenend.org.uk>
	Sun, 15 Jun 2008 17:25:23 +0000 (18:25 +0100)
committer	Richard Kettlewell <rjk@greenend.org.uk>
	Sun, 15 Jun 2008 17:25:23 +0000 (18:25 +0100)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
lib/trackdb.c	patch \|	diff1 \|	diff2 \|	blob \| history