jliew
committed
on 11 Feb 10
LDEV-2506 merge from branch