heyongjian/joy_launcher — pull request #124 by whuthm (2013-10-30 03:31:22+00:00)
Title: huangming:merge the main branch to native branch.

huangming:merge the main branch to native branch.