Change 341

Jonathan Kamens committed this change into //guest/jonathan_kamens

When looking for where a file was branched from, ignore "copy from"
and "merge from" lines -- we only really care about "branch from"
lines.