Initialized merge tracking via "svnmerge" with revisions "1-6679" from trunk
Authored by: osimons 2008-05-15
Parent: [r7065]
Child: [r7067]
