FYI, I'm committing the attached to both the 5.1 branch and the trunk (I've omitted the new files, they have been posted previously). Per the maintainers file, it even builds with -Werror - very nice! enjoy, Andrew