Merge branch 'pami-bgq-commthr-ready' of charmgit:charm into pami-bgq-commthr-ready pami-bgq-commthr-ready
authoryanhua <yanhua@yanhua-Precision-T1600.(none)>
Tue, 9 Oct 2012 05:09:26 +0000 (00:09 -0500)
committeryanhua <yanhua@yanhua-Precision-T1600.(none)>
Tue, 9 Oct 2012 05:09:26 +0000 (00:09 -0500)

Trivial merge