Richard Opalka
committed
on 19 May 09
sync with trunk