Merge commit '7a358316ae1c52fadf7ce8470fc5d257d1a71eaa' into gingerbread * commit '7a358316ae1c52fadf7ce8470fc5d257d1a71eaa': Work around problem w/ large CalendarProvider2 transactions