Merge change I12bbe40a into eclair-mr2

* changes:
  Add new CalendarProvider2 for new sync framework.