Merge in Gemstone 3.2 and tODE support

merge accumulated tODE and GemSTone 3.2 changes into master