Merge branch 'master' of http://einstein/~wking/code/git/parallel_computing
authorW. Trevor King <wking@drexel.edu>
Fri, 12 Nov 2010 17:36:57 +0000 (09:36 -0800)
committerW. Trevor King <wking@drexel.edu>
Fri, 12 Nov 2010 17:36:57 +0000 (09:36 -0800)

Trivial merge