maltes
committed
on 10 Dec 05
Applied #725, fixed #1936