Merge branch 'harshitha/adaptive_lb' of charmgit:charm into adaptive_lb
authorHarshitha <gplkrsh2@illinois.edu>
Mon, 5 Mar 2012 02:04:49 +0000 (20:04 -0600)
committerHarshitha <gplkrsh2@illinois.edu>
Mon, 5 Mar 2012 02:04:49 +0000 (20:04 -0600)

Trivial merge