Merge branch 'charm' of charmgit:charm into charm
authorAbhinav S Bhatele <bhatele@illinois.edu>
Tue, 14 Sep 2010 21:38:21 +0000 (16:38 -0500)
committerAbhinav S Bhatele <bhatele@illinois.edu>
Tue, 14 Sep 2010 21:38:21 +0000 (16:38 -0500)

Trivial merge