* Big trunk merge log:trunk:2983:3047
Authored by: athomas 2006-03-26
Parent: [r3047]
Child: [r3049]