Sorry this is my first patch email. Looks like gmail added a few
newlines. The attached patch file is correctly formatted.