Merge branch 'master' of unix.club.cc.cmu.edu:~cmccabe/git/pub/cmccabe-bin
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Mon, 11 Oct 2010 03:55:51 +0000 (20:55 -0700)
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Mon, 11 Oct 2010 03:55:51 +0000 (20:55 -0700)

Trivial merge