Merged changes from BRANCH_david_3
Authored by: d-farrell2 2005-04-09
Parent: [r1099]
Child: [r1101]