Merge branch 'charm' of charmgit:charm into charm
authorAbhinav Bhatele <bhatele@panache.cs.uiuc.edu>
Wed, 10 Feb 2010 21:06:27 +0000 (15:06 -0600)
committerAbhinav Bhatele <bhatele@panache.cs.uiuc.edu>
Wed, 10 Feb 2010 21:06:27 +0000 (15:06 -0600)
commit3816e21654aae3c2a0d8e4e06ce3a8ab5d9828c3
tree7675f7e3ee6537372fa022cd1ae2f68b0635938b
parent5007ea48c59448a37f7eb8e945ee9d47a14f6a71
parent64789db36c078a9a48d1b6f2f1b74c66eede1d30
Merge branch 'charm' of charmgit:charm into charm

Conflicts:
CHANGES
CHANGES