Merge change I5a7cf57f into eclair-mr2

* changes:
  New calendar sync framework: code review changes, support delete, support multiple calendars, remove triggers.