commit @ 2013-1-9

Signed-off-by: Mason Mei <dongxu.m@gmail.com>