Squashed commit of the following:

commit f41fde6e7ccb82e66aa39cc5d3ece72c20aac4a0
Author: luchang <chang.lu@sihuatech.com>
Date:   Sun Jun 02 22:44:19 2013 +0800

	Merge branch 'master' of https://github.com/waydnow/fsp

commit 01da50e3450b96673a5589e12490c556a9efb619
Author: luchang <chang.lu@sihuatech.com>
Date:   Sun Jun 02 22:41:40 2013 +0800

	goods