Updated the setup() function to the new design.
Authored by: bugman 2008-05-21
Parent: [r6212]
Child: [r6214]