Merge branch 'master' of ssh://einstein/~/public_html/code/git/thesis
authorW. Trevor King <wking@drexel.edu>
Sun, 17 Oct 2010 20:58:37 +0000 (16:58 -0400)
committerW. Trevor King <wking@drexel.edu>
Sun, 17 Oct 2010 20:58:37 +0000 (16:58 -0400)

Trivial merge