Merge branch 'charm' of charmgit:charm into pami-bgq-commthr-ready
authorNikhil Jain <nikhil@illinois.edu>
Mon, 8 Oct 2012 05:20:08 +0000 (00:20 -0500)
committerNikhil Jain <nikhil@illinois.edu>
Mon, 8 Oct 2012 05:20:08 +0000 (00:20 -0500)

Trivial merge