Merged Changes from BRANCH_david_5
Authored by: d-farrell2 2005-09-02
Parent: [r1293]
Child: [r1295]