Merge branch 'harshitha/adaptive_lb' of charmgit:charm into harshitha/adaptive_lb
authorHarshitha Menon <gplkrsh2@illinois.edu>
Sat, 19 Nov 2011 23:43:29 +0000 (17:43 -0600)
committerHarshitha Menon <gplkrsh2@illinois.edu>
Sat, 19 Nov 2011 23:43:29 +0000 (17:43 -0600)

Trivial merge