2009-01-01 - production
20:34	<brion>	live-merging file delete fatal error fix from r45278	[production]