Merge branch 'master' of yang:./rsrch/notes/thesis
authorW. Trevor King <wking@drexel.edu>
Thu, 18 Feb 2010 20:51:49 +0000 (15:51 -0500)
committerW. Trevor King <wking@drexel.edu>
Thu, 18 Feb 2010 20:51:49 +0000 (15:51 -0500)

Trivial merge