Merge branch 'master' of unix.club.cc.cmu.edu:~/git/pub/cmccabe-etc
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Mon, 27 Sep 2010 20:09:48 +0000 (13:09 -0700)
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Mon, 27 Sep 2010 20:09:48 +0000 (13:09 -0700)

Trivial merge