Wed, 29 Jun 2011 23:06:29 -0700 Kevin Walker Automated merge with https://tqft.net/hg/blob/
Wed, 29 Jun 2011 23:06:18 -0700 Kevin Walker nonsense having to do with resloving conflicts
(0) -300 -100 -30 -10 -2 +2 +10 +30 +100 tip