Please ignore the previous patch and use this one instead.  I've fixed a
bug and a couple of formatting errors.

Karthik