Merge commit '30f31a362b23bc054c1e3244d8c6c98758dcfe57' into charm
authorPhil Miller <mille121@illinois.edu>
Thu, 5 Jan 2012 01:05:58 +0000 (19:05 -0600)
committerPhil Miller <mille121@illinois.edu>
Thu, 5 Jan 2012 01:05:58 +0000 (19:05 -0600)

Trivial merge