Merge branch 'master' of unix.club.cc.cmu.edu:~cmccabe/git/pub/cmccabe-bin
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Sun, 1 Aug 2010 19:18:39 +0000 (12:18 -0700)
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Sun, 1 Aug 2010 19:18:39 +0000 (12:18 -0700)

Trivial merge