add by zx 2013.01.16
Merge remote-tracking branch 'origin/master'