Setting merge intial merge info
Authored by: jdavenportmiro 2014-05-29
Parent: [r7791]
Child: [r7793]