maltes
committed
on 05 May 07
Merged from 5.3 what I could detect what needed to be merged