Commited on 20140501_2.
Merge remote-tracking branch 'choose_remote_name/master'
修正乱码。