donb
committed
on 16 Jul 06
Removed Dario's changes