Jay Balunas
committed
on 13 Aug 10
svnmerge RF-9040 + some extra changes for conflicts