tree d37f185d6c1c1aa00c43e963b032e2217aedae1a
parent b4b21842367e76d004cb85d0e1343d0a26f5c2ed
parent 0ef4a301ea778a006282a7114a922673cbfe5948
author buyingyi <buyingyi@gmail.com> 1369167212 -0700
committer buyingyi <buyingyi@gmail.com> 1369167212 -0700

Merge branch 'master' into yingyi/asterix_beta_fix