Hi Andrew,

	(This is a resend, since it wasn't applied against -test4).

	Patch against 2.6-test5.

	Based on Randy's checkversion.pl script.

Felipe