I did:
{{{
svn merge -r3229:3230 https://svn.tokutek.com/tokudb/tokudb.558
}}}


git-svn-id: file:///svn/tokudb@3231 c7de825b-a66e-492c-adef-691d508d4ae1