Merge http://github.com/nullin/testng into Nalin3

Conflicts:
	CHANGES.txt