Merging in calendar database changes.

changes in this pull request by bryan patzke.