Attahched is the patch for 2.5.47+12_patches_from_William_Irwin.  These 
are essentially the bug fixes and bit of clean up.

thanks,
rohit