Merge pull request #21 from gaye/bug-974554

Bug 974554 - CalDAV parser should accept ical inside xml comments nested  in <calendar-data> elements r=millermedeiros
Bug 974554 - Followup to fix packaging bug introduced in c197de