HomeFreeBSD

Try patching up the mergeinfo "properly"