Attaching an improvement to my earlier patch
- http://patchwork.newartisans.com/patch/377/

The earlier patch can now be ignored.

Jambunathan K.