Merge branch 'pami-bgq-commthr-ready' of charmgit:charm into charm
authorNikhil Jain <nikhil@illinois.edu>
Tue, 9 Oct 2012 07:39:27 +0000 (02:39 -0500)
committerNikhil Jain <nikhil@illinois.edu>
Tue, 9 Oct 2012 07:39:27 +0000 (02:39 -0500)

Trivial merge