jliew
committed
on 03 Jul 09
Merge lams2_3 to head (continuing...)