tree 7889a8074316c0cafd3b9a98c5b8f9db59e3dfc0
parent 3ef6fbb1aaef55c25769efce5ed6952ad088ec4f
parent bbe16189edab576f02267790cc4465f3c029d478
author buyingyi <buyingyi@gmail.com> 1369557275 -0700
committer buyingyi <buyingyi@gmail.com> 1369557275 -0700

Merge branch 'yingyi/asterix_beta_fix'