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

Trivial merge