20140628
Merge branch 'xero_dev' of github.com:xqyww123/CProgrammingLanguage into xero_dev

Conflicts:
	10026.c