jliew
committed
on 20 Mar 10
LDEV-2543 merge from branch