Merge branch 'entry_method_templates' into charm
authorPhil Miller <mille121@illinois.edu>
Thu, 5 Apr 2012 21:18:29 +0000 (16:18 -0500)
committerPhil Miller <mille121@illinois.edu>
Thu, 5 Apr 2012 21:18:29 +0000 (16:18 -0500)

Trivial merge