Consider the thread id for findNextAddress()
Merge branch 'master' of github.com:liuml07/giri

Conflicts:
	lib/Giri/TraceFile.cpp