Merge "Fix #2451630 (No calendar after upgrading Eclair->Froyo)"