Manual glue for svn-git migration for r6575 due to multiple merges.

Original message:
Create new main branch from tokudb.1131b+1080a+1185+nostatementexprs. Create in in the new directory layout. Addresses #1131,#1080,#1185,#1193.

newbrt/brtdump.c

@@ -168,7 +168,7 @@ static void
 dump_block_translation(struct brt_header *h, u_int64_t offset) {
     if (offset < h->translated_blocknum_limit) {
         struct block_translation_pair *bx = &h->block_translation[offset];
-        printf("%lu: %ld %ld\n", offset, bx->diskoff, bx->size);
+        printf("%lu: %lu %lu\n", offset, bx->diskoff, bx->size);
     }
 }
 
@@ -237,7 +237,8 @@ split_fields (char *line, char *fields[], int maxfields) {
     return i;
 }
 
-int main (int argc, const char *argv[]) {
+int 
+main (int argc, const char *argv[]) {
     const char *arg0 = argv[0];
     static int interactive = 0;
     argc--; argv++;

newbrt/tests/Makefile

@@ -247,5 +247,6 @@ clean:
 	rm -rf $(BINS) *.o *.bb *.bbg *.da *.gcov *.gcno *.gcda
 	rm -rf test_oexcl.c.tmp *.brt *.dir *.tdb *.dat *.out
 	rm -rf *.exe *.pdb *.ilk *.obj
+	rm -f cachetable-fd-test.ctest2.data
 
 foo: ../cachetable.o ../fifo.o ../fingerprint.o ../key.o ../memory.o ../memarena.o ../mempool.o ../omt.o ../toku_assert.o ../ybt.o ../x1764.o ../trace_mem.o ../threadpool.o