merge2

From:	Josie	(Fri Jun 14 23:29:16 2013)
That insight would have saved us a lot of eorfft early on.