2014-09-19

Signed-off-by: yuanach <yuanach@126.com>
2014-09-25

Signed-off-by: yuanach <yuanach@126.com>
Merge remote-tracking branch 'origin/master'