{{{
svn merge -r7857:8080 https://svn.tokutek.com/tokudb/toku/tokudb
}}}
Addresses #1032, #1289.


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