v260 branch Changes

v260_preview2 to v260_base (2011-11-22 to 2011-12-06) v260