jliew
committed
on 15 Jan 10
LDEV-2481 merged from branch