增加一句話 #20130906
Merge branch 'demo_02' #20130906