Revision 194448

Applies lmckenzi@ca.ibm.com's patch, which would have been very hard
to characterize had he not already done so. That he fixed it is just gravy.
There is one line I'm not sure about, but it passed my tests, so I'll
leave it in and just comment it.