If you
install Perian it will allow any Quicktime enabled application to read and manipulate Avi file types. You should be able to then merge the two files in iMovie, I think?.
If not, in the past I used an
app called D-Vision 3 to join the files. There is
also M-PEG Streamclip which can also do the job I think.