From: W. Trevor King <wking@drexel.edu>
Date: Thu, 25 Nov 2010 16:05:39 +0000 (-0500)
Subject: Merge remote branch 'origin/master'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d526200b168a00a8b048fcc3b06704f57717612d;p=parallel_computing.git

Merge remote branch 'origin/master'
---

d526200b168a00a8b048fcc3b06704f57717612d