测试点东西
Merge branch 'b20121205' of https://github.com/canon550d/hb0712.git into b20121205