Merge branch 'master' of ssh://einstein/~/public_html/code/git/parallel_computing
authorW. Trevor King <wking@drexel.edu>
Tue, 14 Sep 2010 17:40:18 +0000 (13:40 -0400)
committerW. Trevor King <wking@drexel.edu>
Tue, 14 Sep 2010 17:40:18 +0000 (13:40 -0400)

Trivial merge