$ 0 0 *MERGE* Merge subsequent changes to sqlite-rsync that were accidentally missed by the prior check-in. (tags: trunk)