am 9be87f0a: (-s ours) Merge "Fix bug #2927288 (CalendarCache table is not setup correctly) - DO NOT MERGE" into froyo

Merge commit '9be87f0a751a29226f6d2a57054eb0627d370b9b' into gingerbread

* commit '9be87f0a751a29226f6d2a57054eb0627d370b9b':
  Fix bug #2927288 (CalendarCache table is not setup correctly) - DO NOT MERGE