Merge branch 'charm' of charmgit:charm into charm
authorAbhinav S Bhatele <bhatele@illinois.edu>
Sun, 20 Feb 2011 09:12:56 +0000 (03:12 -0600)
committerAbhinav S Bhatele <bhatele@illinois.edu>
Sun, 20 Feb 2011 09:12:56 +0000 (03:12 -0600)

Trivial merge