svn path=/branches/kill-bonobo/; revision=36806
Some code got duplicated for calendars and tasks. Made a note to revisit. svn path=/branches/kill-bonobo/; revision=36560