sync history 2013/5/17

Signed-off-by: Zhengwang Ruan <ruan.zhengwang@gmail.com>