fixed linking of bsondemo #655
Merge branch 'bugfixes/tokumx-1.3'