Simplified the software container setup by absorbing Software and SoftwareList into software_setup().
Authored by: bugman 2009-10-11
Parent: [r9742]
Child: [r9744]
