jliew
committed
on 30 Jun 09
Resolve conflicts from previous merge