Merge "Fix bug #2927288 (CalendarCache table is not setup correctly) - DO NOT MERGE" into froyo