Merged repeat parser changes

Conflicts:
	test/x3/Jamfile
Fixing the bad merge