Merge branch 'master' of /home/einstein/wking/public_html/code/git/parallel_computing
authorW. Trevor King <wking@drexel.edu>
Fri, 1 Oct 2010 14:02:51 +0000 (10:02 -0400)
committerW. Trevor King <wking@drexel.edu>
Fri, 1 Oct 2010 14:02:51 +0000 (10:02 -0400)

Trivial merge