jliew
committed
on 06 Jul 09
merge lams2_3 to head