Manik Surtani
committed
on 30 Apr 08
Updated version