Check-point prior to final merge of HEAD changes
Authored by: wackston2 2004-12-20
Parent: [r2540]
Child: [r2542]