v236 branch Changes

v236_preview to v236_base (2010-07-13 to 2010-07-20) v236