ghz 20131123
Merge remote-tracking branch 'origin/master'
ghz 20131123
Merge remote-tracking branch 'origin/master'
ghz 20131123 prepare_id =>preapareID