including some new files and cleanup of some old ones
Authored by: bryang 2006-01-18
Parent: [r94]
Child: [r96]
