Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <yanhuas@jyc1.(none)>
Wed, 17 Oct 2012 22:16:19 +0000 (17:16 -0500)
committerYanhua Sun <yanhuas@jyc1.(none)>
Wed, 17 Oct 2012 22:16:19 +0000 (17:16 -0500)
commit679a62bf129156befa8b56e64636f4ad055b75d4
treef975765210b4a883a66c221381d5779dd7cdf042
parent8510aea8dabb0ef0164022883925bc2371cc065e
parentb29d126d42c5ad2bdfb3115bb5c5122498b0f471
Merge branch 'charm' of charmgit:charm into charm