Bug 1093219 - m3u parsing

I think I'll revert back to the previous form. At least I know it works.