About to merge 1332+1343 back to main line.
Addresses #1032, #1343.
{{{
svn merge -r8595:8646 https://svn.tokutek.com/tokudb/toku/tokudb.1032b
}}}


git-svn-id: file:///svn/toku/tokudb.1032b+1343@8648 c7de825b-a66e-492c-adef-691d508d4ae1