Comment 10 for bug 179296

Yeah, it was my bad on the merge. I forgot about the symlinks. We will indeed need to have Ubuntu changes as long as we have the iceweasel/firefox diff. I generally like just adding on firefox rather than replacing so that we minimize the delta from Debian. I think we should wait until 0.8.5-1 is uploaded to sid and then merge.