+ fixed a bug where file refs weren't being updated to point to merged files
Authored by: bworrell 2011-08-12
Parent: [r1038]
Child: [r1040]