modified:   src/com/guodu/sms/util/Util.java
	modified:   src/com/guodu/sms/util/Util.java
	new file:   test66
	new file:   ../rsqqwh20.onv.txt.bak
	new file:   ../tg1vdjkl.2n2.txt.bak
	new file:   ../tzxq0e1d.dor.txt.bak
dd

dd
Merge branch 'test_m'

Conflicts:
	GDReadThread/src/com/guodu/sms/util/Util.java