Commit 2ba296dc96754909e316f38985c6fced8b8e4926

William Pitcock 2012-05-05T21:46:20

main: default to unlimited traversal now that we do mergemaster