Merge branch 'master' of ssh://einstein/~/public_html/code/git/thesis
authorW. Trevor King <wking@drexel.edu>
Fri, 19 Mar 2010 10:26:35 +0000 (06:26 -0400)
committerW. Trevor King <wking@drexel.edu>
Fri, 19 Mar 2010 10:26:35 +0000 (06:26 -0400)

Trivial merge