Updates todo, merges died's tags.
authordsc <dsc@less.ly>
Wed, 29 Feb 2012 19:15:20 +0000 (11:15 -0800)
committerdsc <dsc@less.ly>
Wed, 29 Feb 2012 19:15:20 +0000 (11:15 -0800)

Trivial merge