v268 branch Changes

v268_preview2 to v268_base (2012-05-29 to 2012-06-05) v268