Merged revised-webservices branch back into trunk.
Authored by: delphidabbler 2010-07-21
Parent: [r855]
Child: [r857]