v254 branch Changes

v254_preview2 to v254_base (2011-07-12 to 2011-07-19) v254