'2013-07-20-19:07:03'
Merge branch 'master' of github.com:HelinYoung/pub1.0version

Conflicts:
	3rdHW.py

Signed-off-by: Young <HelinYoung@Gmail.com>