jliew
committed
on 21 Oct 09
LDEV-2448 merged from branch