Patch reviewed and applied in r21770 (forgot the ticket header).