msurtani
committed
on 30 May 07
Updated for CR2