Merge branch 'charm' of charmgit:charm into harshitha/adaptive_lb
authorHarshitha <gplkrsh2@illinois.edu>
Fri, 19 Oct 2012 23:11:35 +0000 (18:11 -0500)
committerHarshitha <gplkrsh2@illinois.edu>
Fri, 19 Oct 2012 23:11:35 +0000 (18:11 -0500)

Trivial merge