Edit: Factor/GSoC/2010/Support more calendars

Describe this revision: