Patch for 1305320/1304709

Hi People,

I know these bugs were assigned to Jared, but I wanted to get them  
fixed. However, there are a few decisions in the previous code that I  
could not figure out the purpose of. So please test this patch to see  
if my logic changes have broken anything for you. They seem to be  
working fine on my calendars.
Thanks,
--
Wesley Miaw
wesley@xxxxxxxxxx

todo.diff
Description: Binary data