Ernie Ghiglione
committed
on 27 Jul 09
LDEV-2185: Merging from branch to head