Fix up inconsistencies and an out-of-dateness (we have a delta combiner now).
Fix up inconsistencies and an out-of-dateness (we have a delta combiner
now).

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion