v269 branch Changes

v269_preview2 to v269_base (2012-06-19 to 2012-06-26) v269