tree caa96ac32ee88f089f3f3b147d0574691ac37d55
parent d15684c4461af0cfbe57a4def4a2ab1946cfb04c
parent efa27a3a2bd37819fca29f292c8c11f8bffaa0a6
author buyingyi <buyingyi@gmail.com> 1374008067 -0700
committer buyingyi <buyingyi@gmail.com> 1374008067 -0700

Merge branch 'yingyi/asterix_fix'