v234 branch Changes

v234_preview to v234_base (2010-06-15 to 2010-06-22) v234