Merged changes from BRANCH_david_3
Authored by: d-farrell2 2005-04-07
Parent: [r1094]
Child: [r1096]