SeanRogers
committed
on 21 Mar 11
Updated according to review RFPL-1350