tree 756f3105eb8df7e205747137a90d91bce2e4c557
parent f17db3d7b212a8f4b2e84ad4b559e92c40512a44
parent 5a05d466c779b4a87e5e21c20af369b42777cf79
author buyingyi <buyingyi@gmail.com> 1370357915 -0700
committer buyingyi <buyingyi@gmail.com> 1370357915 -0700

Merge branch 'master' into yingyi/asterix_beta_fix