Merge remote branch 'origin/machine-common-codes' into charm
authorPhil Miller <mille121@illinois.edu>
Thu, 26 May 2011 20:16:38 +0000 (15:16 -0500)
committerPhil Miller <mille121@illinois.edu>
Thu, 26 May 2011 20:16:38 +0000 (15:16 -0500)

Trivial merge