Updated the return_data() and return_error() methods to the new relax design.
Authored by: bugman 2008-05-21
Parent: [r6221]
Child: [r6223]