Hi

Please find attached a newer version of the patch I sent out earlier today.
This patch has exactly the same code as earlier, it is just formatted in a
neater way.
(We realized this after an internal review of my code).

Please merge this patch if there are no other issues.

Thanks
Aniket