luisf
committed
on 22 Jun 06
conditions parsing better managed