2009-07-10 - production
17:43	<Andrew>	Apply r52926, r52930, and update Resources and EditToolbar/images	[production]