Merge branch 'harshitha/adaptive_lb' of charmgit:charm into harshitha/adaptive_lb
authorHarshitha <gplkrsh2@illinois.edu>
Tue, 22 May 2012 23:33:32 +0000 (18:33 -0500)
committerHarshitha <gplkrsh2@illinois.edu>
Tue, 22 May 2012 23:33:32 +0000 (18:33 -0500)

Trivial merge